Browse Source

已读未读

459242451@qq.com 3 years ago
parent
commit
6ca4331573

+ 4 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -176,12 +176,13 @@ public class IncidentController extends BaseController {
                             }
                             // 循环完之后,去除最后一个顿号
                             if (StrUtil.isNotBlank(unMessage)) {
-                                unMessage = StrUtil.removeSuffix(unMessage, "、") + "未读。";
+                                unMessage = StrUtil.removeSuffix(unMessage, "、");
                             }
                             if (StrUtil.isNotBlank(message)) {
-                                message = StrUtil.removeSuffix(message, "、") + "已读。";
+                                message = StrUtil.removeSuffix(message, "、");
                             }
-                            incidentProcess.setUserRead(unMessage + message);
+                            incidentProcess.setUserRead(message);
+                            incidentProcess.setUserUnRead(unMessage);
                         }
                     }
                 }

+ 3 - 0
ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentProcess.java

@@ -65,4 +65,7 @@ public class IncidentProcess implements Serializable {
     @TableField(exist = false)
     private String userRead;
 
+    @TableField(exist = false)
+    private String userUnRead;
+
 }