Merge branch 'develop' into 'develop'

message数据重复问题 See merge request !78
2016-12-19 11:08:29 +08:00 · 2016-12-19 11:08:29 +08:00 · b74ddd8348
parent 38659fc5a9 711f234148
commit b74ddd8348
1 changed files with 4 additions and 3 deletions
--- a/app/models/message.rb
+++ b/app/models/message.rb
@ -337,11 +337,12 @@ class Message < ActiveRecord::Base
              self.delay.contain_messages_message(dm)
              dm.clear
            end
+          end
+        end
+
        unless dm.empty?
          self.delay.contain_messages_message(dm)
        end
-          end
-        end

      end
    end