Commit c3a91864 authored by cq990612's avatar cq990612

优化代码结构

parent 1e74a94a
...@@ -836,7 +836,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -836,7 +836,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
types.add(project.getType()); types.add(project.getType());
} }
}); });
}else{ } else {
projectIds.add(-1); projectIds.add(-1);
types.add(-1); types.add(-1);
} }
...@@ -996,11 +996,15 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -996,11 +996,15 @@ 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);
DeptUserDto deptUserDto = new DeptUserDto();
if (!CollectionUtils.isEmpty(deptNotOrderInfo)) { if (!CollectionUtils.isEmpty(deptNotOrderInfo)) {
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);
} else {
deptUserDto.setDeptId(user.getDeptId());
deptUserDto.setDeptName(workDeptService.getById(user.getDeptId()).getDeptName());
deptUserDtos.add(deptUserDto);
} }
} }
if (!CollectionUtils.isEmpty(deptUserDtos) && !CollectionUtils.isEmpty(deptNotOrderInfo)) { if (!CollectionUtils.isEmpty(deptUserDtos) && !CollectionUtils.isEmpty(deptNotOrderInfo)) {
......
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