Merge remote-tracking branch 'origin/master'

# Conflicts:
#	doc/待更新脚本

doc/待更新脚本

@@ -8,19 +8,20 @@ update sys_menu set ViewPath = 'views/workTask/index'  where MenuNo='T01040101';
 update sys_menu set ViewPath = 'views/workTask/add'  where MenuNo='T01040102';
 update sys_menu set ViewPath = 'views/workTask/edit'  where MenuNo='T01040103';
 update sys_menu set ViewPath = 'views/workTask/detail'  where MenuNo='T01040105';
-
 update sys_menu set OrderNo = '6',Icon='ScheduleOutlined',Url='/taskAndLog',isLeaf=1 where MenuNo='T010402' ;
 update sys_menu set ViewPath = 'views/workLog/index'  where MenuNo='T01040201';
 update sys_menu set ViewPath = 'views/workLog/add'  where MenuNo='T01040202';
 update sys_menu set ViewPath = 'views/workLog/edit'  where MenuNo='T01040203';
 update sys_menu set ViewPath = 'views/workLog/detail'  where MenuNo='T01040205';
-
 update sys_menu set OrderNo = '7' where MenuNo='T0105';
 update sys_menu set OrderNo = '8' where MenuNo='T0106';
 
 --2024-5-8 工作日志表添加驿站ID
 ALTER TABLE pc_dowork ADD COLUMN `SiteID` VARCHAR ( 50 ) NULL AFTER `WorkTime`;
 
+-- 2024-5-9 日志、任务权限编码调整
+UPDATE `sys_function_code` SET ParentFunctionCode = 'T01', OrderNo = 4 WHERE FunctionCode = 'T010401';
+UPDATE `sys_function_code` SET ParentFunctionCode = 'T01', OrderNo = 4 WHERE FunctionCode = 'T010402';
 
 --2024-5-9 新增工种表及数据插入
 create table pc_workcategory
@@ -32,8 +33,6 @@ create table pc_workcategory
    Status               int,
    primary key (WorkCategoryID)
 );
-
-
 INSERT INTO pc_workcategory VALUES ('20200100000', '', '政府/科研/教育/培训', 1, 1);
 INSERT INTO pc_workcategory VALUES ('20200200000', '', '人事/行政/管理', 2, 1);
 INSERT INTO pc_workcategory VALUES ('20200300000', '', 'IT/计算机/互联网通讯/电子', 3, 1);

h5app/src/views/pages/company/editPost.vue

@@ -290,12 +290,6 @@ export default defineComponent({
       await alert.present();
     }
 
-
-    const onSetProfessionID = (data: any)=>{
-      formState.dataModel.professionID = data.value;
-      formState.dataModel.professionName = data.text;
-    }
-
     const onSetWorkCategoryID = (data: any)=>{
       formState.dataModel.workCode = data.value;
       formState.dataModel.workCategoryName = data.text;
@@ -489,7 +483,6 @@ export default defineComponent({
       recruitCountBlur,
       onIsTrailChange,
       onSetWorkCategoryID,
-      onSetProfessionID,
       onSave,
       back,
     }

h5app/src/views/pages/jobUserInfo/jobHuntEdit.vue

@@ -240,11 +240,6 @@ export default defineComponent({
       const result :any = await get('system/area/getCityList',{});
       workAreaList.value = result;
     }
-
-    const onSetProfessionID = (data: any)=>{
-      jobHuntData.dataModel.professionID = data.value;
-      jobHuntData.dataModel.professionName = data.text;
-    }
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
@@ -350,7 +345,6 @@ export default defineComponent({
       workYearTypeList,
       workAreaList,
       setOpen,
-      onSetProfessionID,
       onSave,
       onCancel,
       loadData,

h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -293,10 +293,6 @@ export default defineComponent({
       });
       await alert.present();
     }
-    const onSetProfessionID = (data: any)=>{
-      formState.dataModel.professionID = data.value;
-      formState.dataModel.professionName = data.text;
-    }
 
     const onSetWorkCategoryID = (data: any)=>{
       formState.dataModel.workCode = data.value;
@@ -481,7 +477,6 @@ export default defineComponent({
       onResultInfo,
       recruitCountBlur,
       onSetWorkCategoryID,
-      onSetProfessionID,
       onSave,
       back,
     }

h5app/src/views/pages/jobhunt/jobHuntEdit.vue

@@ -201,7 +201,6 @@ export default defineComponent({
       return {dataModel:{
           jobHuntType:{required},
           jobUserType:{required},
-          professionID:{required},
           professionName:{required},
           minSalary:{required},
           maxSalary:{required},
@@ -245,11 +244,6 @@ export default defineComponent({
       workAreaList.value = result;
     }
 
-    const onSetProfessionID = (data: any)=>{
-      jobHuntData.dataModel.professionID = data.value;
-      jobHuntData.dataModel.professionName = data.text;
-    }
-
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
@@ -353,7 +347,6 @@ export default defineComponent({
       workYearTypeList,
       workAreaList,
       setOpen,
-      onSetProfessionID,
       onSave,
       onCancel,
       loadData,

h5app/src/views/sapp/tabMain.vue

@@ -149,7 +149,7 @@ export default defineComponent({
         pageSize: 1000,
       });
 
-      const taskWarningList = result.list.filter((it: any) => it.taskLevel === 1);
+      const taskWarningList = result.list.filter((it: any) => it.taskLevel === 1 && it.taskStatus === 0);
 
       if (taskWarningList.length > 0) {
         const alert = await alertController.create({

src/main/java/com/hz/employmentsite/filter/exception/BaseErrorEnum.java

@@ -2,9 +2,9 @@ package com.hz.employmentsite.filter.exception;
 
 public enum BaseErrorEnum implements BaseErrorInfoInterface {
     SUCCESS("200", "成功"),
-    BODY_NOT_MATCH("400", "数据格式不匹配！"),
+    BODY_NOT_MATCH("400", "数据格式不匹配！请联系系统管理员！"),
     NOT_FOUND("404", "访问资源不存在"),
-    INTERNAL_SERVER_ERROR("500", "服务器内部错误！"),
+    INTERNAL_SERVER_ERROR("500", "服务器内部错误！请联系系统管理员！"),
     USER_PASSWORD_ERROR("10001", "用户名或密码错误！"),
     DELETE_NOT_DATA_ERROR("10002", "删除的数据不存在！"),
     IMPORT_DATA_ERROR("10003", "导入数据存在错误，请查看错误列表，更正后重新导入！"),

src/main/java/com/hz/employmentsite/filter/exception/GlobalExceptionHandler.java

@@ -19,7 +19,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = NullPointerException.class)
     public BaseResponse<Object> exceptionHandler(NullPointerException e) {
         logger.error("发生空指针异常！原因是：" + e);
-        return RespGenerstor.fail(BaseErrorEnum.BODY_NOT_MATCH,e);
+        return RespGenerstor.fail(BaseErrorEnum.BODY_NOT_MATCH,"");
     }
 
     @ExceptionHandler(value = Exception.class)

src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -138,7 +138,7 @@ public class PostServiceImpl implements PostService {
         }
 
         //判断岗位id是否为空
-        if (stringUtils.IsNullOrEmpty(data.professionID)) {
+        if (stringUtils.IsNullOrEmpty(data.getProfessionID())) {
             PcProfessionExample proEmp = new PcProfessionExample();
             PcProfessionExample.Criteria proCia = proEmp.or();
             proCia.andParentProfessionIDNotEqualTo("");

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -17,6 +17,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service("JobHuntService")
@@ -116,6 +117,40 @@ public class JobHuntServiceImpl implements JobHuntService {
         JobHuntVo record = get(data.jobHuntID);
         PcJobhunt dbData = record == null ? null : pcJobhuntMapper.selectByPrimaryKey(record.jobHuntID);
         Boolean isExist = dbData != null;
+
+        //判断岗位id是否为空
+        if (stringUtils.IsNullOrEmpty(data.getProfessionID())) {
+            PcProfessionExample proEmp = new PcProfessionExample();
+            PcProfessionExample.Criteria proCia = proEmp.or();
+            proCia.andParentProfessionIDNotEqualTo("");
+            proCia.andProfessionNameEqualTo("其他");
+            //获取二级其他信息
+            PcProfession proOther = pcProfessionMapper.selectByExample(proEmp).stream().findFirst().orElse(null);
+            if (proOther != null) {
+                proEmp = new PcProfessionExample();
+                proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID());
+//                proCia.andProfessionNameEqualTo(data.getProfessionName());
+
+                //查询其他岗位
+                List<PcProfession> proOtherSonList = pcProfessionMapper.selectByExample(proEmp);
+                PcProfession proOtherSon = proOtherSonList.stream()
+                        .filter(x -> x.getProfessionName().equals(data.getProfessionName())).findFirst().orElse(null);
+                if (proOtherSon != null) {
+                    data.setProfessionID(proOtherSon.getProfessionID());
+                } else {
+                    data.setProfessionID(UUID.randomUUID().toString());
+                    PcProfession proModel = new PcProfession();
+                    proModel.setProfessionID(data.getProfessionID());
+                    proModel.setParentProfessionID(proOther.getProfessionID());
+                    proModel.setProfessionName(data.getProfessionName());
+                    proModel.setStatus(Integer.parseInt("1"));
+                    proModel.setOrderNo(proOtherSonList.size() + 1);
+
+                    pcProfessionMapper.insert(proModel);
+                }
+            }
+        }
+
         if (!isExist) {
             //添加
             dbData = new PcJobhunt();