xc

efs-bus/src/main/java/com/zjty/efs/bus/service/impl/NoticeServiceImpl.java

@@ -88,11 +88,11 @@ public class NoticeServiceImpl implements NoticeService {
                     addressee1.setUnit(userDo1.getUnit());
                     addresseeList2.add(addressee1);
 
-                    String data2 = "[" +userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()
-                            + "]收到了来自[" + userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
-                            + "]关于[" + notice.getTitle() + "]的通知";
+                    String data2 = "[" +userDo1.getUnit() + "_" + userDo1.getName()
+                            + "]收到了来自[" + userDo.getUnit() + "_" + userDo.getName()
+                            + "]的《" + notice.getTitle() + "》";
 
-                    dataList = dataList + "[" + userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()
+                    dataList = dataList + "[" + userDo1.getUnit() + "_" + userDo1.getName()
                             + "] ";
 
                     efsLogUtil.addLog(new EfsLog(null, userDo1.getId(), data2, new Date()));
@@ -112,7 +112,7 @@ public class NoticeServiceImpl implements NoticeService {
 //                            + "]收到了来自[" + userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
 //                            + "]关于[" + notice.getTitle() + "]的通知";
 
-                    String data2 = "您收到了[" + userDo.getUnit() + "][" + userDo.getName() + "]的《" + notice.getTitle() + "》，" +
+                    String data2 = "您收到了[" + userDo.getUnit() + "_" + userDo.getName() + "]的《" + notice.getTitle() + "》，" +
                             "请注意查看。";
 
                     Attention attention = new Attention();
@@ -127,9 +127,9 @@ public class NoticeServiceImpl implements NoticeService {
 
                 notice.setAddressee(add2);
                 noticeDao.save(notice);
-                String data1 = "[" +userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
+                String data1 = "[" +userDo.getUnit() + "_" + userDo.getName()
                         + "]给"  + dataList
-                        + "发送了关于[" + notice.getTitle() + "]的通知";
+                        + "发送了《" + notice.getTitle() + "》";
 
                 String data3 = "您给"+ dataList + "发送了《" + notice.getTitle() + "》,发送成功！";
 
@@ -240,12 +240,12 @@ public class NoticeServiceImpl implements NoticeService {
     public boolean updateStatus(List<Notice> notices, String userId) {
         try {
             UserDo userDo = userService.findById(userId); // 当前登录人
-            String data = "[" +userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
-                    + "修改";
+            String data = "[" +userDo.getUnit() + "_" + userDo.getName()
+                    + "]修改";
             for (Notice notice:notices){
                 notice.setStatus(1);
                 noticeDao.save(notice);
-                data = data + "[" + notice.getTitle() + "]";
+                data = data + "《" + notice.getTitle() + "》 ";
             }
             data = data + "为已读";