Commit d92463ef authored by cq990612's avatar cq990612

优化代码结构

parent 3a1b0bee
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
ORDER BY d.sort,u.name ORDER BY CONVERT( u.name USING gbk )
</select> </select>
......
...@@ -940,7 +940,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -940,7 +940,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
WorkUser user = workUserService.getById(userId); WorkUser user = workUserService.getById(userId);
List<Integer> ranks = UserRoleLevelUtils.getRankByUserAndLevelName(userId, LevelEnum.PROJECT_MANAGER.getLevelName()); List<Integer> ranks = UserRoleLevelUtils.getRankByUserAndLevelName(userId, LevelEnum.USER_STATISTICS.getLevelName());
if (CollectionUtils.isEmpty(ranks)) { if (CollectionUtils.isEmpty(ranks)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN); throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
} }
...@@ -998,7 +998,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -998,7 +998,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
deptUserDtos.add(deptUserDto); deptUserDtos.add(deptUserDto);
} }
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) {
...@@ -1016,9 +1015,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -1016,9 +1015,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