优化代码结构

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

@@ -578,13 +578,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
     public List<ProjectManagerDto> getProjectManagerDto(WorkUser user, List<WorkType> workTypes) {
         List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(user.getId());
+
         if (CollectionUtils.isEmpty(roleUserLevel)) {
             return null;
         }
+        List<ProjectManagerDto> projectManagerDtos = new ArrayList<>();
         for (UserRoleLevelDto userRoleLevelDto : roleUserLevel) {
             // 如果有审批权限
             if (LevelEnum.EXAMINE.getLevelName().equals(userRoleLevelDto.getLevelName())) {
-                List<ProjectManagerDto> projectManagerDtos = new ArrayList<>();
                 List<ProjectDto> projectDtos = workProjectService.getByManagerId(user.getId(), 1);
                 if (LevelRankEnum.PROJECT_LEVEL.getRank().equals(userRoleLevelDto.getRank())) {
                     if (!CollectionUtils.isEmpty(projectDtos)) {
@@ -612,7 +613,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                     }
                 }
 
-                if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(userRoleLevelDto.getRank()) || LevelRankEnum.CENTRAL_LEVEL.getRank().equals(userRoleLevelDto.getRank())) {
+                if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(userRoleLevelDto.getRank())) {
                     List<WorkType> workTypeServiceAll = workTypeService.getAll(null);
                     if (!CollectionUtils.isEmpty(workTypeServiceAll)) {
                         List<WorkType> managerTypes = new ArrayList<>();
@@ -645,11 +646,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                         }
                     }
                 }
-                sort(projectManagerDtos);
-                return projectManagerDtos;
             }
         }
-        return null;
+        sort(projectManagerDtos);
+        return projectManagerDtos;
+
     }
 
     // 获取可以填报的数据