fix(任务模块): 修改了查询任务根据展示id的查询

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -83,6 +83,7 @@ public class TaskServiceImpl implements TaskService {
     @Autowired
     private MessageService messageService;
 
+
     @Autowired
     AreaService areaService;
 
@@ -645,10 +646,9 @@ public class TaskServiceImpl implements TaskService {
                         .filter(taskUserVo -> !Collections.disjoint(idLists, taskUserVo.getInvolveUserIdList())||(taskUserVo.getCreateUserId()!=null&&idLists.contains(taskUserVo.getCreateUserId())))
                         .collect(Collectors.toList());
             }
+
             if (taskSelectVo.getAreaId()!=null){
-                List<Integer>  ids = areaService.findIdQuerySubordinateIds(taskSelectVo.getAreaId());
-                List<Integer>  unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());
-                List<Integer>  userIDs= userService.findUnitsIdInUsers2(unitIds).stream().map(User::getUserId).collect(Collectors.toList());
+                List<Integer> userIDs=userPublicService.findByAreaExhibitionIdSubordinateAll(taskSelectVo.getAreaId()).stream().map(Units::getUnitId).collect(Collectors.toList());
                 taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
             }
             if (taskSelectVo.getUnitId()!=null){

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

@@ -157,8 +157,7 @@ public class UserPublicServiceImpl implements UserPublicService {
     public List<Units> findByAreaExhibitionIdSubordinateAll(Integer areaExhibitionId) {
         List<Integer> areaExhibitionIds = areaExhibitionCache.findByFatherId(areaExhibitionId).stream().map(AreaExhibition::getId).collect(Collectors.toList());
         areaExhibitionIds.add(areaExhibitionId);
-       List<Units> unitsList = unitsCache.findAllByAreaExhibitionIdList(areaExhibitionIds);
-        return unitsList;
+        return unitsCache.findAllByAreaExhibitionIdList(areaExhibitionIds);
     }