Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -454,7 +454,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         HashMap<String, List<String>> p2 = this.packParams("appointmentType", "MANUAL");
         HashMap<String, List<String>> p2 = this.packParams("appointmentType", "MANUAL");
         items.add(new ScheduleSummaryResp.ValueDTO("人工指派", map.getOrDefault("manualTotal", 0), null, urlName, p2));
         items.add(new ScheduleSummaryResp.ValueDTO("人工指派", map.getOrDefault("manualTotal", 0), null, urlName, p2));
 
 
-        HashMap<String, List<String>> p3 = this.packParams("appointmentStatus", "NOT_ASSIGNED");
+        HashMap<String, List<String>> p3 = this.packParams("appointmentStatus", "INIT");
         items.add(new ScheduleSummaryResp.ValueDTO("未指派", map.getOrDefault("notAssignTotal", 0), null, urlName, p3));
         items.add(new ScheduleSummaryResp.ValueDTO("未指派", map.getOrDefault("notAssignTotal", 0), null, urlName, p3));
         return items;
         return items;
     }
     }

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -177,8 +177,8 @@ public class UserService {
             }
             }
             resourceInfo.setChildren(levelTowConvert);
             resourceInfo.setChildren(levelTowConvert);
         }
         }
-        levelOne = levelOne.stream().sorted(Comparator.comparing(ResourceInfo::getOrder))
-                .collect(Collectors.toList());
+        // levelOne = levelOne.stream().sorted(Comparator.comparing(ResourceInfo::getOrder))
+        //         .collect(Collectors.toList());
         userDTO.setMenus(levelOne);
         userDTO.setMenus(levelOne);
 
 
         //用户组织机构从关联表获取
         //用户组织机构从关联表获取