Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
dbcb15a05a

+ 3 - 5
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -183,8 +183,6 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);	
-			//推送消息
 		}else if(subject == SubjectType.YUN_YING.getTypeCode()){
 			String tmp = selectSendUser(targetMap,targetType);
 			if(tmp !=null){
@@ -211,10 +209,10 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}			
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);
-			//推送消息
-			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		}
+		if(producerTarget.size()>0) insertBatchProducer(producerTarget);
+		//推送消息
+		if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		return 1;
 	}