Merge branch 'master' of git.yfzx.zjtys.com.cn:matrix/device-back into dev

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -254,6 +254,7 @@ public interface DeviceLibraryService {
 
     List<String> getMaxPartSeqNumber(String model,Integer isPart);
 
+
     /**
      * 通过 packing 查询装备
      * @param packing 列装id
@@ -262,4 +263,5 @@ public interface DeviceLibraryService {
     List<DeviceLibrary> findDevicesByPacking(Integer packing);
 
     void updateMatchingRange(List<DeviceLibrary> libraries);
+
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -770,6 +770,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
 
 
     }
+
     @Override
     public List<DeviceLibrary> findDevicesByPacking(Integer packing) {
         return  deviceLibraryDao.findAllByPackingId(packing);

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

@@ -642,6 +642,17 @@ 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.findUnitsIdInUsers(unitIds).stream().map(User::getUserId).collect(Collectors.toList());
+                taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
+            }
+            if (taskSelectVo.getUnitId()!=null){
+                List<Integer>  userIDs= userService.findAllByUnite(taskSelectVo.getUnitId()).stream().map(User::getUserId).collect(Collectors.toList());
+                taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
+            }
+
             taskUserVos = taskUserVos.stream()
                     .filter(taskUserVo -> !businesses.contains(taskUserVo.getBusinessType()) || (taskUserVo.getParentTaskId() == null || taskUserVo.getParentTaskId() == 0))
                     .filter(taskUserVo -> !taskUserVo.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id))