From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/SystemMessageServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/SystemMessageServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/SystemMessageServiceImpl.java
index b24a68d..32b0674 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/SystemMessageServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/SystemMessageServiceImpl.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.driver.modular.system.dao.SystemMessageMapper;
+import com.supersavedriving.driver.modular.system.warpper.SystemMessageWarpper;
import com.supersavedriving.driver.modular.system.model.SystemMessage;
import com.supersavedriving.driver.modular.system.service.ISystemMessageService;
-import com.supersavedriving.driver.modular.system.warpper.SystemMessageWarpper;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -45,7 +45,7 @@
@Override
public void readSystems(Integer uid, String ids) throws Exception {
String[] split = ids.split(",");
- List<SystemMessage> systemMessages = this.selectList(new EntityWrapper<SystemMessage>().eq("userType", 2).eq("userId", uid).in("id", split));
+ List<SystemMessage> systemMessages = this.selectList(new EntityWrapper<SystemMessage>().in("id", split));
for (SystemMessage systemMessage : systemMessages) {
systemMessage.setIsRead(1);
}
@@ -65,4 +65,9 @@
systemMessage.setUserType(userType);
this.insert(systemMessage);
}
+
+ @Override
+ public void clearSystemMessage(Integer userId) throws Exception {
+ this.baseMapper.clearSystemMessage(userId);
+ }
}
--
Gitblit v1.7.1