fix(培训模块，单位侧边栏): 市 和区县查询的数据有问题，以及重新报名提示被其他人操作啦

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -262,11 +262,15 @@ public class TrainJobController {
         TaskBto taskBto = taskService.get(taskId);
         Units units=unitsService.findById(taskBto.getOwnUnit());
         TrainTheme trainTheme = trainThemeService.findById(taskBto.getBillId());
-        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), StatusEnum.TRAIN1016);
+        List<StatusEnum> statusEnums =new ArrayList<>();
+        statusEnums.add(StatusEnum.TRAIN1017);
+        statusEnums.add(StatusEnum.TRAIN1016);
+
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
         taskBto = taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1017, 0);
         List<Integer> userIds = userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
         userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().filter(user -> !user.getUserId().equals(securityUser.getCurrentUserInfo().getUserId())).map(User::getUserId).collect(Collectors.toList()));
-        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, "让 重新培训报名:【"+units.getName()+"】", userIds, trainTheme.getTrainId().toString()));
+        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, "重新 培训报名:【"+units.getName()+"】", userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/AreaServiceImpl.java

@@ -156,7 +156,7 @@ public class AreaServiceImpl implements AreaService {
     private List<Integer> areaId(List<Integer> ids,Integer areaId){
        List<Area> areas= areaCache.findAllByFatherId(areaId);
        ids.add(areaId);
-       if (areas!=null&&areas.size()!=0){
+       if (areas!=null && areas.size()!=0){
            areas.forEach(
                    area -> {
                        areaId(ids,area.getId());

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -298,7 +298,7 @@ public class UnitsServiceImpl implements UnitsService {
         LeftNavigation leftNavigation = new LeftNavigation();
         List<LeftNavigation> leftNavigationList = new ArrayList<>();
         Units units=securityUser.getCurrentUserInfo().getUnits();
-        if (units.getLevel()==1 && units.getType()==1 || units.getLevel()==2){
+        if (units.getLevel()==1 && units.getType()==1){
             AreaExhibition areaExhibition=areaExhibitionCache.findById(units.getExhibitionId());
             AreaExhibition areaExhibitionParent=areaExhibitionCache.findById(areaExhibition.getFatherId());
             leftNavigation=areaExhibitionParent.toLeftNavigation();
@@ -314,7 +314,13 @@ public class UnitsServiceImpl implements UnitsService {
                 leftNavigationList.add(leftNavigation1);
                 leftNavigation.setLeftNavigations(leftNavigationList);
             }
-        }else {
+        }else if (units.getLevel()==2){
+            AreaExhibition areaExhibition=areaExhibitionCache.findById(units.getExhibitionId());
+            leftNavigation = areaExhibition.toLeftNavigation();
+            List<LeftNavigation> leftNavigationList1=unitsCache.findAllByAreaExhibitionId(areaExhibition.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
+            leftNavigation.setLeftNavigations(leftNavigationList1);
+
+        } else {
             leftNavigation= units.toLeftNavigation();
             leftNavigation.setLeftNavigations(leftNavigationList);
         }