完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -75,7 +75,6 @@
         <if test="type != null">and type = #{type}</if>
         <if test="isOvertime != null">and is_overtime = #{isOvertime}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
-        <if test="modifyTime != null">and #{modifyTime} &gt;= modify_time</if>
         <if test="rejectTime !=null">and reject_time = #{rejectTime}</if>
     </sql>
 
@@ -213,7 +212,7 @@
             <if test="startDay != null">
                 AND modify_time>=#{startModifyTime}
             </if>
-            <if test="">
+            <if test="startWorkTime != null">
                 AND work_day>=#{startWorkTime}
             </if>
             <if test="projectIdList != null">

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

@@ -149,7 +149,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         List<Integer> role = UserRoleLevelUtils.getRole(userId);
         List<Integer> list = UserRoleLevelUtils.getlevelIds(role);
         List<WorkLevel> workLevels = UserRoleLevelUtils.getlevelByIds(list);
-        List<Integer> rank = this.getUserRank(workLevels, LevelEnum.EXAMINE.getLevelName());
+
         // 本月第一天
         Date firstDayOfMonth = DateUtil.getCurrentFirstDayOfMonth();
         // 返回数据对象
@@ -184,10 +184,12 @@ public class StatisticsServiceImpl implements StatisticsService {
                 // 项目和商机的未审批的数
                 notCompletedCount1 = workTimeOrderMapper.getCountByCondition(map);
             }
-
+            
+            // 用户在该权限对应的级别
+            List<Integer> rank = this.getUserRank(workLevels, LevelEnum.EXAMINE.getLevelName());
             // 查询用户负责审批的除项目合商机的其余类型
             Integer notCompletedCount2 = 0;
-            if (rank.contains(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
+            if (CollectionUtil.isNotEmpty(rank) && rank.contains(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
                 map.remove("projectIdList");
                 List<WorkType> allType = workTypeMapper.getAll();
                 List<Integer> type = new ArrayList<>();