优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -996,31 +996,33 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(rankMax)) {
             deptIds.add(user.getDeptId());
             deptNotOrderInfo = workTimeOrderMapper.getDeptNotOrderInfo(userId, deptIds, startDate, endDate);
-            DeptUserDto deptUserDto = new DeptUserDto();
-            deptUserDto.setDeptId(deptNotOrderInfo.get(0).getDeptId());
-            deptUserDto.setDeptName(deptNotOrderInfo.get(0).getDeptName());
-            deptUserDtos.add(deptUserDto);
-        }
-
-        for (DeptUserDto deptUserDto : deptUserDtos) {
-            List<UserDto> userDtos = new ArrayList<>();
-            for (DeptUserCollectDto deptUserCollectDto : deptNotOrderInfo) {
-                UserDto userDto = new UserDto();
-                List<Date> workDays1 = new ArrayList<>(workDays);
-                Date createDate = DateUtils.bigDateToShortDate(deptUserCollectDto.getCreateTime());
-                workDays1.removeIf(date1 -> date1.compareTo(createDate) < 0);
-                userDto.setId(deptUserCollectDto.getUserId());
-                userDto.setName(deptUserCollectDto.getUserName());
-                workDays1.removeAll(deptUserCollectDto.getWorkDay());
-                userDto.setNotWorkDays(workDays1.size());
-                if (deptUserCollectDto.getDeptId().equals(deptUserDto.getDeptId())) {
-                    userDtos.add(userDto);
+            if (!CollectionUtils.isEmpty(deptNotOrderInfo)) {
+                DeptUserDto deptUserDto = new DeptUserDto();
+                deptUserDto.setDeptId(deptNotOrderInfo.get(0).getDeptId());
+                deptUserDto.setDeptName(deptNotOrderInfo.get(0).getDeptName());
+                deptUserDtos.add(deptUserDto);
+            }
+        }
+        if (!CollectionUtils.isEmpty(deptUserDtos) && !CollectionUtils.isEmpty(deptNotOrderInfo)) {
+            for (DeptUserDto deptUserDto : deptUserDtos) {
+                List<UserDto> userDtos = new ArrayList<>();
+                for (DeptUserCollectDto deptUserCollectDto : deptNotOrderInfo) {
+                    UserDto userDto = new UserDto();
+                    List<Date> workDays1 = new ArrayList<>(workDays);
+                    Date createDate = DateUtils.bigDateToShortDate(deptUserCollectDto.getCreateTime());
+                    workDays1.removeIf(date1 -> date1.compareTo(createDate) < 0);
+                    userDto.setId(deptUserCollectDto.getUserId());
+                    userDto.setName(deptUserCollectDto.getUserName());
+                    workDays1.removeAll(deptUserCollectDto.getWorkDay());
+                    userDto.setNotWorkDays(workDays1.size());
+                    if (deptUserCollectDto.getDeptId().equals(deptUserDto.getDeptId())) {
+                        userDtos.add(userDto);
 
+                    }
                 }
+                deptUserDto.setUserDtos(userDtos);
             }
-            deptUserDto.setUserDtos(userDtos);
         }
-
         notWorkSubmitOrderDto.setDeptUserDtos(deptUserDtos);
         return notWorkSubmitOrderDto;
     }