完善工时统计

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

@@ -175,24 +175,28 @@ public class StatisticsServiceImpl implements StatisticsService {
             map.put("startWorkDay", firstDayOfMonth);
             map.put("statusArray", statusArray);
 
-            // 查询用户负责的项目和商机id
-            List<Integer> projectIdList = workProjectMapper.getProjectIdByManager(userId);
 
+
+            // 用户在该权限对应的级别
+            List<Integer> rank = this.getUserRank(roleUserLevel, LevelEnum.EXAMINE.getLevelName());
             // 项目和商机的未审批的数
             Integer notCompletedCount1 = 0;
-            if (CollectionUtil.isNotEmpty(projectIdList)) {
-                map.put("projectIdList", projectIdList);
-                notCompletedCount1 = workTimeOrderMapper.getCountByCondition(map);
+            // 项目商机级别，查询用户负责项目商机未审批条数
+            if (rank.contains(LevelRankEnum.PROJECT_LEVEL.getRank())) {
+                // 查询用户负责的项目和商机id
+                List<Integer> projectIdList = workProjectMapper.getProjectIdByManager(userId);
+                if (CollectionUtil.isNotEmpty(projectIdList)) {
+                    map.put("projectIdList", projectIdList);
+                    notCompletedCount1 = workTimeOrderMapper.getCountByCondition(map);
+                }
             }
-            // 用户在该权限对应的级别
-            List<Integer> rank = this.getUserRank(roleUserLevel, LevelEnum.EXAMINE.getLevelName());
-            // 查询用户负责审批的除项目合商机的其余类型
+            // 部门，查询用户负责审批的除项目、商机、请假、调休的其余类型
             Integer notCompletedCount2 = 0;
             if (rank.contains(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
                 map.remove("projectIdList");
                 List<WorkType> allType = workTypeMapper.getAll();
                 List<Integer> type = new ArrayList<>();
-                for (int i = 4; i < allType.size(); i++) {
+                for (int i = 5; i < allType.size(); i++) {
                     type.add(allType.get(i).getId());
                 }
                 map.put("typeList", type);