Commit 1e74a94a authored by cq990612's avatar cq990612

优化代码结构

parent 3f0f3c1f
...@@ -996,12 +996,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -996,12 +996,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(rankMax)) { if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(rankMax)) {
deptIds.add(user.getDeptId()); deptIds.add(user.getDeptId());
deptNotOrderInfo = workTimeOrderMapper.getDeptNotOrderInfo(userId, deptIds, startDate, endDate); deptNotOrderInfo = workTimeOrderMapper.getDeptNotOrderInfo(userId, deptIds, startDate, endDate);
if (!CollectionUtils.isEmpty(deptNotOrderInfo)) {
DeptUserDto deptUserDto = new DeptUserDto(); DeptUserDto deptUserDto = new DeptUserDto();
deptUserDto.setDeptId(deptNotOrderInfo.get(0).getDeptId()); deptUserDto.setDeptId(deptNotOrderInfo.get(0).getDeptId());
deptUserDto.setDeptName(deptNotOrderInfo.get(0).getDeptName()); deptUserDto.setDeptName(deptNotOrderInfo.get(0).getDeptName());
deptUserDtos.add(deptUserDto); deptUserDtos.add(deptUserDto);
} }
}
if (!CollectionUtils.isEmpty(deptUserDtos) && !CollectionUtils.isEmpty(deptNotOrderInfo)) {
for (DeptUserDto deptUserDto : deptUserDtos) { for (DeptUserDto deptUserDto : deptUserDtos) {
List<UserDto> userDtos = new ArrayList<>(); List<UserDto> userDtos = new ArrayList<>();
for (DeptUserCollectDto deptUserCollectDto : deptNotOrderInfo) { for (DeptUserCollectDto deptUserCollectDto : deptNotOrderInfo) {
...@@ -1020,7 +1022,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -1020,7 +1022,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
} }
deptUserDto.setUserDtos(userDtos); deptUserDto.setUserDtos(userDtos);
} }
}
notWorkSubmitOrderDto.setDeptUserDtos(deptUserDtos); notWorkSubmitOrderDto.setDeptUserDtos(deptUserDtos);
return notWorkSubmitOrderDto; return notWorkSubmitOrderDto;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment