fix(watch): 消息通知列表bug修改
This commit is contained in:
+3
@@ -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,6 +91,7 @@ public class WatchMqttNoticeController extends JeecgController<WatchMqttNotice,
|
|||||||
if(loginUser!=null){
|
if(loginUser!=null){
|
||||||
mn.setCreateByName(loginUser.getRealname());
|
mn.setCreateByName(loginUser.getRealname());
|
||||||
}
|
}
|
||||||
|
if(StringUtils.isNotEmpty(mn.getUserId())){
|
||||||
String[] userIds = mn.getUserId().split(",");
|
String[] userIds = mn.getUserId().split(",");
|
||||||
List<String> nameList = new ArrayList<>();
|
List<String> nameList = new ArrayList<>();
|
||||||
for (String userId : userIds) {
|
for (String userId : userIds) {
|
||||||
@@ -101,6 +103,7 @@ public class WatchMqttNoticeController extends JeecgController<WatchMqttNotice,
|
|||||||
mn.setUserName(StrUtil.join(",", nameList));
|
mn.setUserName(StrUtil.join(",", nameList));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user