merge conflict

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/NoticeServiceImpl.java

@@ -143,7 +143,7 @@ public class NoticeServiceImpl implements NoticeService{
             MessageInfoDTO msg = new MessageInfoDTO();
             String endUrl = null;
             if (!StringUtils.isEmpty(noticer.getType()) || !StringUtils.isEmpty(noticer.getPersonId())) {
-                if (noticer.getType().split(",")[0].equals("1")) {
+                if ("1".equals(noticer.getType().split(",")[0])) {
                     endUrl = "/parent/" + id + "?stuId=" + noticer.getPersonId().split(",")[0];
                 } else {
                     endUrl = "/teacher/" + id + "?teacherId=" + noticer.getPersonId().split(",")[0];
@@ -155,31 +155,13 @@ public class NoticeServiceImpl implements NoticeService{
                 msg.setKeyword2("校办公室");
                 msg.setKeyword3(DateUtils.format());
                 msg.setKeyword4(data.getNotify_details());
-                msg.setRemark(data.getNotify_remarks());
+                msg.setRemark("谢谢使用!");
                 msg.setTemplateId(template.getSt_templateid());
                 msg.setTouser(noticer.getOpenid());
                 msg.setAppId(school.getSchool_appid());
                 msg.setSecret(school.getSchool_secret());
                 msgs.add(msg);
             }
-            if (noticer.getType() == 1) {
-                endUrl = "/parent/" + id + "?stuId=" + noticer.getPersonId();
-            }else {
-                endUrl = "/teacher/" + id + "?teacherId=" + noticer.getPersonId();
-            }
-            String url = baseWechatUrl + "/notifyDetail" + endUrl;
-            msg.setUrl(url);
-            msg.setTitle(data.getNotify_title());
-            msg.setKeyword1(school.getSchool_name());
-            msg.setKeyword2("校办公室");
-            msg.setKeyword3(DateUtils.format());
-            msg.setKeyword4(data.getNotify_details());
-            msg.setRemark("谢谢使用!");
-            msg.setTemplateId(template.getSt_templateid());
-            msg.setTouser(noticer.getOpenid());
-            msg.setAppId(school.getSchool_appid());
-            msg.setSecret(school.getSchool_secret());
-            msgs.add(msg);
         });
         if (msgs.size() > 0) {
             TransferDTO transferDTO = new TransferDTO();