消息列表sql修改 清除未读不生效修改

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java

@@ -110,7 +110,7 @@ public class OcrMsgReadController  {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
         QueryWrapper<OcrMsg> wrapperlist = new QueryWrapper<>();
-        wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)");
+        wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply(" FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)");
 
         QueryWrapper<OcrMsgRead> wrapperone = new QueryWrapper<>();
 
@@ -128,7 +128,6 @@ public class OcrMsgReadController  {
                 ocrmsgread.setReadFlag(1);
                 ocrmsgread.setReadTime(System.currentTimeMillis());
                 ocrMsgReadService.save(ocrmsgread);
-                return ResultVoUtil.success(ResultVo.SUCCESS);
             }
         }
         //此处需要手工处理 返回需要将修改后的数据返回

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml

@@ -42,23 +42,9 @@
             ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
             m.msg_category = '2'
-            AND m.receive_user_type = '1'
+            AND m.receive_user_type IN(1,2)
-            AND FIND_IN_SET( ""#{userid}"", m.receive_user_ids )
+            AND m.send_status = '1'
-
+            AND FIND_IN_SET( '${userid}', m.receive_user_ids )
-            UNION ALL
-
-            SELECT
-            m.id as id,
-            m.titile as titile,
-            "系统管理员" AS userNcame,
-            m.bus_json AS busJson,
-            r.read_flag as readFlag,
-            m.send_time AS sendTime
-            FROM
-            ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
-            WHERE
-            m.msg_category = '2'
-            AND m.receive_user_type = '2'
         </if>
 
         <if test='msgCategory == "1" '>
@@ -75,24 +61,9 @@
             WHERE
             m.msg_category = '1'
             AND
-            m.receive_user_type = '1'
+            m.receive_user_type IN(1,2)
-            AND FIND_IN_SET( ""#{userid}"", m.receive_user_ids )
+            AND m.send_status = '1'
-
+            AND FIND_IN_SET( '${userid}', m.receive_user_ids )
-            UNION ALL
-            SELECT
-            m.id as id,
-            m.titile as titile,
-            u.USERNAME as userName,
-            m.bus_json as busJson,
-            r.read_flag as readFlag,
-            m.send_time as sendTime
-            FROM
-            ocr_msg m LEFT JOIN s_user_t u ON m.sender=u.ID
-            LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
-            WHERE
-            m.msg_category = '1'
-            AND
-            m.receive_user_type = '2'
         </if>