fix(watch): 消息通知列表bug修改
This commit is contained in:
+10
-7
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.renkang.watch.constant.WatchConstants;
|
||||
import com.renkang.watch.entity.WatchMqttNotice;
|
||||
@@ -90,15 +91,17 @@ public class WatchMqttNoticeController extends JeecgController<WatchMqttNotice,
|
||||
if(loginUser!=null){
|
||||
mn.setCreateByName(loginUser.getRealname());
|
||||
}
|
||||
String[] userIds = mn.getUserId().split(",");
|
||||
List<String> nameList = new ArrayList<>();
|
||||
for (String userId : userIds) {
|
||||
String name = userMap.get(userId);
|
||||
if (StrUtil.isNotEmpty(name)) {
|
||||
nameList.add(name);
|
||||
if(StringUtils.isNotEmpty(mn.getUserId())){
|
||||
String[] userIds = mn.getUserId().split(",");
|
||||
List<String> nameList = new ArrayList<>();
|
||||
for (String userId : userIds) {
|
||||
String name = userMap.get(userId);
|
||||
if (StrUtil.isNotEmpty(name)) {
|
||||
nameList.add(name);
|
||||
}
|
||||
}
|
||||
mn.setUserName(StrUtil.join(",", nameList));
|
||||
}
|
||||
mn.setUserName(StrUtil.join(",", nameList));
|
||||
}
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
|
||||
Reference in New Issue
Block a user