|
|
@@ -178,7 +178,7 @@ public class QueryWorkOrderPageListService { |
|
|
|
} |
|
|
|
|
|
|
|
String assignUsers = workOrderPageListVo.getAssignUser(); |
|
|
|
if (!StringUtils.isEmpty(assignUsers)) { |
|
|
|
if (StringUtils.isNotEmpty(assignUsers) && ObjectUtil.isNotNull(assignUserMap)) { |
|
|
|
String[] assignUserArr = assignUsers.split(","); |
|
|
|
for (String au : assignUserArr) { |
|
|
|
assignUser = assignUserMap.get(au); |
|
|
@@ -243,7 +243,7 @@ public class QueryWorkOrderPageListService { |
|
|
|
} |
|
|
|
} |
|
|
|
List<User> userList = null; |
|
|
|
if (!CollectionUtil.isEmpty(assignUserIdList)) { |
|
|
|
if (CollectionUtil.isNotEmpty(assignUserIdList)) { |
|
|
|
userList = userMapper.selectList(new LambdaQueryWrapper<User>() |
|
|
|
.in(User::getId, assignUserIdList) |
|
|
|
.eq(User::getMark, 1)); |