Procházet zdrojové kódy

组织画像-标准执行

chenshudong před 3 měsíci
rodič
revize
eea563f0c7

+ 9 - 9
airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -1245,9 +1245,9 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
1245
             // 班组
1245
             // 班组
1246
             Long finalTeamId = teamId;
1246
             Long finalTeamId = teamId;
1247
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedTeamId(), finalTeamId)).collect(Collectors.toList());
1247
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedTeamId(), finalTeamId)).collect(Collectors.toList());
1248
-            if (CollUtil.isEmpty(target)) {
1249
-                return null;
1250
-            }
1248
+//            if (CollUtil.isEmpty(target)) {
1249
+//                return null;
1250
+//            }
1251
             // 本科排名处理
1251
             // 本科排名处理
1252
             SysDept sysDeptTeam = sysDeptService.selectDeptById(teamId);
1252
             SysDept sysDeptTeam = sysDeptService.selectDeptById(teamId);
1253
             Long ksId = sysDeptTeam.getParentId();
1253
             Long ksId = sysDeptTeam.getParentId();
@@ -1388,9 +1388,9 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
1388
             // 科级
1388
             // 科级
1389
             Long finalDepartmentId = departmentId;
1389
             Long finalDepartmentId = departmentId;
1390
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedDepartmentId(), finalDepartmentId)).collect(Collectors.toList());
1390
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedDepartmentId(), finalDepartmentId)).collect(Collectors.toList());
1391
-            if (CollUtil.isEmpty(target)) {
1392
-                return null;
1393
-            }
1391
+//            if (CollUtil.isEmpty(target)) {
1392
+//                return null;
1393
+//            }
1394
             // 本大队排名处理
1394
             // 本大队排名处理
1395
             SysDept sysDeptKs = sysDeptService.selectDeptById(departmentId);
1395
             SysDept sysDeptKs = sysDeptService.selectDeptById(departmentId);
1396
             Long ddId = sysDeptKs.getParentId();
1396
             Long ddId = sysDeptKs.getParentId();
@@ -1483,9 +1483,9 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
1483
             // 大队级
1483
             // 大队级
1484
             Long finalbrigadeId = brigadeId;
1484
             Long finalbrigadeId = brigadeId;
1485
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), finalbrigadeId)).collect(Collectors.toList());
1485
             target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), finalbrigadeId)).collect(Collectors.toList());
1486
-            if (CollUtil.isEmpty(target)) {
1487
-                return null;
1488
-            }
1486
+//            if (CollUtil.isEmpty(target)) {
1487
+//                return null;
1488
+//            }
1489
             // 本站排名处理
1489
             // 本站排名处理
1490
             List<CheckLargeScreenCorrectionPortraitSqlDto> stationList = all;
1490
             List<CheckLargeScreenCorrectionPortraitSqlDto> stationList = all;
1491
             Map<Long, Long> brigadeIdCountMap = stationList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeId, Collectors.counting()));
1491
             Map<Long, Long> brigadeIdCountMap = stationList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeId, Collectors.counting()));