From 11ae4a32394eb4c2941e57bf93fe224dcb6663ff Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 15 May 2023 15:54:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=89=B9=E9=87=8F=E5=B7=B2=E8=AF=BBapi?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8IDOR=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java  | 3 ++-
 .../java/io/dataease/service/message/SysMsgService.java     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java
index c0155e1a42..efc5ad7b23 100644
--- a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java
+++ b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java
@@ -19,9 +19,10 @@ public interface ExtSysMsgMapper {
             "<foreach collection='msgIds' item='msgId' open='(' separator=',' close=')' >",
             " #{msgId}",
             "</foreach>",
+            " and user_id = #{uid}",
             "</script>"
     })
-    int batchStatus(@Param("msgIds") List<Long> msgIds, @Param("time") Long time);
+    int batchStatus(@Param("msgIds") List<Long> msgIds, @Param("time") Long time, @Param("uid") Long uid);
 
     @Delete({
             "<script>",
diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java
index 99038d3b57..381c3d1e17 100644
--- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java
+++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java
@@ -1,16 +1,16 @@
 package io.dataease.service.message;
 
-import io.dataease.commons.utils.LogUtil;
-import io.dataease.ext.ExtSysMsgMapper;
 import io.dataease.commons.constants.SysMsgConstants;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.commons.utils.LogUtil;
 import io.dataease.controller.sys.request.BatchSettingRequest;
 import io.dataease.controller.sys.request.MsgRequest;
 import io.dataease.controller.sys.request.MsgSettingRequest;
 import io.dataease.controller.sys.response.MsgGridDto;
 import io.dataease.controller.sys.response.SettingTreeNode;
 import io.dataease.controller.sys.response.SubscribeNode;
+import io.dataease.ext.ExtSysMsgMapper;
 import io.dataease.plugins.common.base.domain.*;
 import io.dataease.plugins.common.base.mapper.SysMsgChannelMapper;
 import io.dataease.plugins.common.base.mapper.SysMsgMapper;
@@ -105,7 +105,7 @@ public class SysMsgService {
     }
 
     public void setBatchRead(List<Long> msgIds) {
-        extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis());
+        extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis(), AuthUtils.getUser().getUserId());
     }
 
     public void batchDelete(List<Long> msgIds) {