修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -895,18 +895,6 @@ 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.setCurrentUsersName(currentUsersName);
                         if (workOrder.getOrderTypeId() != null) {
                             workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
                         }
@@ -947,6 +935,20 @@ public class WorkOrderManageController {
                                 }
                             }
                         }
+                        String currentUsersName = null;
+                        if(workOrder.getCurrentUsers() != null) {
+                            String[] currentUserIds = workOrder.getCurrentUsers().split(",");
+                            for (String currentUserId : currentUserIds) {
+                                if(!currentUserId.equals("")) {
+                                    if (currentUsersName == null) {
+                                        currentUsersName = userMap.get(Long.valueOf(currentUserId));
+                                    } else {
+                                        currentUsersName = currentUsersName + "," + userMap.get(Long.valueOf(currentUserId));
+                                    }
+                                }
+                            }
+                        }
+                        workOrder.setCurrentUsersName(currentUsersName);
                     }catch (Exception e){
 
                     }