renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(watch): 消息通知列表bug修改

Browse Source
This commit is contained in:
hejiayang
2026-03-16 18:09:49 +08:00
parent f4598505c2
commit 618020de3a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchMqttNoticeController.java
+10 -7
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.renkang.watch.constant.WatchConstants; import com.renkang.watch.constant.WatchConstants;
import com.renkang.watch.entity.WatchMqttNotice; import com.renkang.watch.entity.WatchMqttNotice;
@@ -90,15 +91,17 @@ public class WatchMqttNoticeController extends JeecgController<WatchMqttNotice,
if(loginUser!=null){ if(loginUser!=null){
mn.setCreateByName(loginUser.getRealname()); mn.setCreateByName(loginUser.getRealname());
} }
String[] userIds = mn.getUserId().split(","); if(StringUtils.isNotEmpty(mn.getUserId())){
List<String> nameList = new ArrayList<>(); String[] userIds = mn.getUserId().split(",");
for (String userId : userIds) { List<String> nameList = new ArrayList<>();
String name = userMap.get(userId); for (String userId : userIds) {
if (StrUtil.isNotEmpty(name)) { String name = userMap.get(userId);
nameList.add(name); if (StrUtil.isNotEmpty(name)) {
nameList.add(name);
}
} }
mn.setUserName(StrUtil.join(",", nameList));
} }
mn.setUserName(StrUtil.join(",", nameList));
} }
} }
return Result.OK(pageList); return Result.OK(pageList);