优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -40,7 +40,7 @@ public enum BASE_RESP_CODE_ENUM {
     WORK_ORDER_ALREADY_COMMIT("619", "工单类型重复,不能重复填报"),
     WORK_TIME_OVER_NOW_DAY("620", "工单日期不能大于当天"),
     INSERT_WORK_COLLECT_DATA_FAIL("621", "插入工时单汇总信息失败"),
-    NO_JOIN_EVERY_PROJECT_PLASE_JION("622", "您还没有加入项目中，请先去加入项目"),
+    NO_JOIN_EVERY_PROJECT_PLASE_JION("622", "请选择项目名称"),
     THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN("623", "您不是管理员，请登录管理员账号"),
     DEPT_NOT_HAVE_USER("624", "该部门下没有人员"),
     PROJECT_NOT_HAVE_USER("624", "该部门下没有项目"),

wisenergy-model/src/main/java/cn/wisenergy/model/enums/ProjectTypeEnum.java

@@ -5,7 +5,7 @@ public enum ProjectTypeEnum {
     BUSINESS_OPPORTUNITY(2, "商机", 1),
     LEAVE(3, "请假", 2),
     COMPENSATORY_LEAVE(4, "调休", 2),
-    EXTERNAL_BUSINESS(5, "外部商务与、技术交流", 3),
+    EXTERNAL_BUSINESS(5, "外部商务、技术交流", 3),
     INTERNAL_TRAINING(6, "内部培训、技术准备、管理", 3),
     OTHER_NON_PROJECTS(7, "其他非项目/商机工作", 3),
     ;

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

@@ -441,14 +441,17 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         WorkUser user = workUserService.getById(userId);
         if (0 != user.getLevel()) {
             QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
-            for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
-                if (!value.getReviewer().equals(3)) {
-                    continue;
-                }
-                if (value.getType().equals(type)) {
-                    wrapper.eq("dept_id", user.getDeptId());
+            if (null != type) {
+                for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
+                    if (!value.getReviewer().equals(3)) {
+                        continue;
+                    }
+                    if (value.getType().equals(type)) {
+                        wrapper.eq("dept_id", user.getDeptId());
+                    }
                 }
             }
+
             wrapper.in("status", COMPLETED, RE_SUBMIT);
             wrapper.eq(type != null, "type", type);
             wrapper.eq(projectId != null, "project_id", projectId);