From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
index 509814b..22a8e25 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
@@ -63,7 +63,7 @@
* @return
*/
@Override
- public List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid) {
+ public List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid, Integer language) {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = null;
if(type == 1){//系统公告
@@ -72,6 +72,7 @@
if(type == 2){//系统消息
list = systemNoticeMapper.queryList(type, pageNum, size, uid);
for(Map<String, Object> map : list){
+ map.put("title", language == 1 ? "系统提示" : language == 2 ? "System prompt" : "Rappel du système");
systemNoticeMapper.readSystemNotice(Integer.valueOf(String.valueOf(map.get("id"))), uid);
}
}
--
Gitblit v1.7.1