Merge remote-tracking branch 'origin/master'

doc/待更新脚本

@@ -18,4 +18,8 @@ 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 `employmentsitedb`.`pc_dowork` ADD COLUMN `SiteID` VARCHAR ( 50 ) NULL AFTER `WorkTime`;
+ALTER TABLE `employmentsitedb`.`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';

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", "导入数据存在错误，请查看错误列表，更正后重新导入！"),