优化代码结构

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

@@ -218,8 +218,12 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         Integer rank = null;
         for (WorkLevel level : workLevels) {
             if (LevelEnum.PROJECT_MANAGER.getLevelName().equals(level.getName())) {
-                rank = level.getRank();
-                break;
+                if (null == rank) {
+                    rank = level.getRank();
+                }
+                if (null != rank && rank<level.getRank()) {
+                    rank = level.getRank();
+                }
             }
         }
         if (null == rank) {
@@ -236,7 +240,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             List<Integer> deptIds = new ArrayList<>();
             WorkCentre workCentre = workCentreMapper.getByManagerId(user.getId());
             HashMap<String, Object> map = new HashMap<>(5);
-            System.out.println(workCentre);
             map.put("centre_id", workCentre.getId());
             List<WorkDept> workDeptList = workDeptMapper.getDeptByCondition(map);
             workDeptList.forEach(workDept -> deptIds.add(workDept.getId()));

wisenergy-service/src/main/java/cn/wisenergy/service/utils/UserRoleLevelUtils.java

@@ -105,6 +105,8 @@ public class UserRoleLevelUtils {
         return workLevels;
     }
 
+
+
     /**
      * 获取所有的角色
      * @return List<WorkRole>