|
@@ -855,6 +855,14 @@ public class WorkOrderManageController {
|
|
|
if(workOrder.getUpdateBy()!=null) {
|
|
|
idList.add(Long.valueOf(workOrder.getUpdateBy()));
|
|
|
}
|
|
|
+ if(workOrder.getCurrentUsers() != null) {
|
|
|
+ String[] currentUserIds = workOrder.getCurrentUsers().split(",");
|
|
|
+ for(String currentUserId:currentUserIds){
|
|
|
+ if(!StringUtils.isEmpty(currentUserId)) {
|
|
|
+ idList.add(Long.valueOf(currentUserId));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
Long[] ids = idList.toArray(new Long[0]);
|
|
|
List<UserEntity> userEntityList=userCenterClient.findUserIdsByUserIds(ids);
|
|
@@ -864,6 +872,18 @@ public class WorkOrderManageController {
|
|
|
for(int i = 0; i < result.size(); i++) {
|
|
|
WorkOrderManageDto workOrder = result.get(i);
|
|
|
try {
|
|
|
+ String currentUsersName = null;
|
|
|
+ if(workOrder.getCurrentUsers() != null) {
|
|
|
+ String[] currentUserIds = workOrder.getCurrentUsers().split(",");
|
|
|
+ for (String currentUserId : currentUserIds) {
|
|
|
+ if (currentUsersName == null) {
|
|
|
+ currentUsersName = userMap.get(Long.valueOf(currentUserId));
|
|
|
+ } else {
|
|
|
+ currentUsersName = currentUsersName + "," + userMap.get(Long.valueOf(currentUserId));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ workOrder.setCurrentTaskName(currentUsersName);
|
|
|
if (workOrder.getOrderTypeId() != null) {
|
|
|
workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
|
|
|
}
|