Commit 71c4dd6a by 阮思源

Merge branch 'zyj-fixbug-userserch' into 'master'

fixbug

See merge request rays/pcloud-book!426
parents b0d4e19d 3282f023
...@@ -84,6 +84,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz { ...@@ -84,6 +84,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
List<String> wxIds=new ArrayList<>(); List<String> wxIds=new ArrayList<>();
if(StringUtil.isNotBlank(search)){ if(StringUtil.isNotBlank(search)){
wxIds=wechatGroupConsr.getByUserQuery(search); wxIds=wechatGroupConsr.getByUserQuery(search);
if (ListUtils.isEmpty(wxIds)){
return new PageBeanNew<>(currentPage, numPerPage, 0, list);
}
} }
Integer count = taskMapper.getSubscribeCount(search,taskId,subscribeType,wxIds); Integer count = taskMapper.getSubscribeCount(search,taskId,subscribeType,wxIds);
if (count <= 0) { if (count <= 0) {
...@@ -178,6 +181,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz { ...@@ -178,6 +181,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
List<String> wxIds = new ArrayList<>(); List<String> wxIds = new ArrayList<>();
if (StringUtil.isNotBlank(search)) { if (StringUtil.isNotBlank(search)) {
wxIds = wechatGroupConsr.getByUserQuery(search); wxIds = wechatGroupConsr.getByUserQuery(search);
if (ListUtils.isEmpty(wxIds)){
return new PageBeanNew<>(currentPage, numPerPage, 0, list);
}
} }
Integer count = timeControlTaskSendMapper.getTaskItemSendUserCount(wxIds, taskItemId, robotWxId); Integer count = timeControlTaskSendMapper.getTaskItemSendUserCount(wxIds, taskItemId, robotWxId);
if (count <= 0) { if (count <= 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment