1.负责人审核更新数据库

2.修改流程图、表单
3.更新用户

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -201,7 +201,7 @@ public class CmcAssessController extends BaseController
     public AjaxResult modify(@RequestParam("form")String formData)
     {
         JSONObject formDataJson = JSONObject.parse(formData);
-        CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formDataJson.getString("formId"));
+        CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formDataJson.getString("assessId"));
         cmcAssess.setProjectId(formDataJson.getLong("projectId"));
         cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
         cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
@@ -216,7 +216,7 @@ public class CmcAssessController extends BaseController
         cmcAssess.setManagerTime(formDataJson.getDate("managerTime"));
         for (String key : formDataJson.keySet()) {
             if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(4)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(4)).get(0);
                 StringBuilder roles = new StringBuilder();
                 for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
                     String rolei = "";
@@ -230,42 +230,42 @@ public class CmcAssessController extends BaseController
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
-                CmcAssessContentWork cmcAssessContentWork = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("formId") + key.substring(1)).get(0);
+                CmcAssessContentWork cmcAssessContentWork = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId") + key.substring(1)).get(0);
                 cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
-                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+                cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWork);
             }
             if (key.startsWith("familiar")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(8)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
                 cmcAssessContent.setFamiliar(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("remark")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(6)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
                 cmcAssessContent.setRemark(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("workload")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(8)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
                 cmcAssessContent.setWorkload(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("skill")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(5)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(5)).get(0);
                 cmcAssessContent.setSkill(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("quality")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(7)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(7)).get(0);
                 cmcAssessContent.setQuality(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("assessment")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(10)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(10)).get(0);
                 cmcAssessContent.setAssessment(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("advice")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(6)).get(0);
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
                 cmcAssessContent.setAdvice(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -99,14 +99,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (Objects.isNull(task)) {
             return AjaxResult.error("任务不存在");
         }
-        if (DelegationState.PENDING.equals(task.getDelegationState())) {
-            taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
-            taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
-        } else {
-            taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
-            Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
-            taskService.setAssignee(taskVo.getTaskId(), userId.toString());
-            taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
+        //如果pass变量是通过，存入流程任务变量表
+        if (Objects.nonNull(taskVo.getVariables().get("pass")))
+            runtimeService.setVariable(task.getExecutionId(), "pass", taskVo.getVariables().get("pass"));
+        else {
+            if (DelegationState.PENDING.equals(task.getDelegationState())) {
+                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
+                taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
+            } else {
+                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
+                Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+                taskService.setAssignee(taskVo.getTaskId(), userId.toString());
+                taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
+            }
         }
         return AjaxResult.success();
     }

oa-back/sql/ry_20231130.sql

@@ -105,83 +105,83 @@ insert into sys_user values (24, 104, '18202833529', '黎   超', '00', '', '182
 insert into sys_user values (25, 104, '13111885671', '刘   兴', '00', '', '13111885671', '0', '', '$2a$10$Ag2jfz8ppoSP4bpohVVD1evq8glP6O4tY0HD9DoXXhsPpxSP8egSy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (26, 104, '18782949671', '梁   洁', '00', '', '18782949671', '1', '', '$2a$10$BZurM7Hzy/aquuAlLkk/pOD.y0Ks.BtYcCTTyEwtJHY3QEgFdwRBe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (27, 104, '18681251027', '高天沄', '00', '', '18681251027', '0', '', '$2a$10$xk96PJpjcUIWEo9RTTOKYubqeSXETSUSbRYFjpCgSr1z9PPKUSKsu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (28, 105, '18202802155', '彭   敏', '00', '', '18202802155', '1', '', '$2a$10$ozjePPQbsp9YORLj7r4.K.lTC/9E/ANgDsOHsEyHlQ9DP2MtggiAO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (29, 105, '13699682119', '苟   丹', '00', '', '13699682119', '1', '', '$2a$10$Jt.lg9CXVwlm0puSYFS6IOjxrSPAAHuf5gFmRtRX89IAwJlL8bm4e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (30, 105, '18780223280', '周文婷*', '00', '', '18780223280', '1', '', '$2a$10$pg.prMidA.76KkPRsZsOQuKStpl74J29heNpxCtJbZqDl7i9DjIuu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (28, 105, '18780223280', '周文婷*', '00', '', '18780223280', '1', '', '$2a$10$pg.prMidA.76KkPRsZsOQuKStpl74J29heNpxCtJbZqDl7i9DjIuu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (29, 105, '18202802155', '彭   敏', '00', '', '18202802155', '1', '', '$2a$10$ozjePPQbsp9YORLj7r4.K.lTC/9E/ANgDsOHsEyHlQ9DP2MtggiAO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (30, 105, '13699682119', '苟   丹', '00', '', '13699682119', '1', '', '$2a$10$Jt.lg9CXVwlm0puSYFS6IOjxrSPAAHuf5gFmRtRX89IAwJlL8bm4e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (31, 105, '15102831685', '宋丹丹', '00', '', '15102831685', '1', '', '$2a$10$/j4MpWKxCUekgxiTD1yyyOpOVJme5YbfJz042FuNJLuccxkC2yJSm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (32, 106, '15802829286', '向艳雄', '00', '', '15802829286', '0', '', '$2a$10$FQo1zf1ss2OZw4eIlzzxwOyPV0FkkLDN0ZBxqRSIijNpUCCSxBjQy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (33, 106, '18828096127', '朱   静', '00', '', '18828096127', '0', '', '$2a$10$PrXuWRk4u9d05TNI9MAGjeGwmsSglOtGNKX.fjDuRwmTfVSFr4x9C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (34, 106, '13882148315', '陈尚云', '00', '', '13882148315', '0', '', '$2a$10$I7CDnjCXqmbFmxdgcsoZ/uhgvEahRGZ/u3P4bdIU1Kic49Itu97JG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (35, 106, '18113169528', '蒲   帆', '00', '', '18113169528', '0', '', '$2a$10$Z.3Y46kvgMCHpVSsXl3WJO4OOLJhr5IlzXTQqWx1a8yR1HaJQJQQW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (36, 106, '18408201550', '邹帅民', '00', '', '18408201550', '0', '', '$2a$10$VC/JGLy.P6yJ5LJHmuq2dur.wnHYDzzxjyaizC8fYVNRq5DBmjjIm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (37, 106, '13808178930', '周   芝', '00', '', '13808178930', '1', '', '$2a$10$4SuEJ.5YZSnk3UlpISWBmer7UZVMBKuMNBiG2/lUKafwNr1jI1UF2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (38, 106, '18780290087', '苟   旭', '00', '', '18780290087', '0', '', '$2a$10$QCU/ERPaKSs5CAuWWB2WZ.13fxht6GKgGORCBS8DUy3qBmJybgzM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (39, 107, '18280462009', '刘媛媛', '00', '', '18280462009', '1', '', '$2a$10$SWNBLt43nQQJPC58DZmZcuHqkhre8lOMfl87AnM5UKuMrMfuPpaO6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (40, 107, '18200194440', '吴   振', '00', '', '18200194440', '0', '', '$2a$10$a3ozNbqM6BYYISEJGIpx5O83L1RpMXNc4A9gpPu93qZ9PahUzx24u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (41, 107, '15892280776', '王   刚', '00', '', '15892280776', '0', '', '$2a$10$ulhCOUUylhfnX7iccme6I.zpwLdnvU3zXXuMJ9LtRILnviD6Pvg9u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (42, 107, '18140026972', '朱倪强', '00', '', '18140026972', '0', '', '$2a$10$HLRPkMz/orRnHouLjKNoH.Mn..dH97urH6up1x5AO0ZmtL64wp5XG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (43, 107, '18408248664', '李   圆', '00', '', '18408248664', '1', '', '$2a$10$nMUdzmsF1Tk1FOR7k92kMulRN31LkiWV45F3eAAvNwCS8acu9endK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (44, 107, '18783205676', '李泳龙', '00', '', '18783205676', '0', '', '$2a$10$LHQQe3UHQgaJDCnPl.gujuBKgRhrMN88kPKRxev2HSvOrV2IDRAfG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (45, 108, '13402863790', '何   杰', '00', '', '13402863790', '0', '', '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (46, 108, '18224091291', '杨玉婧', '00', '', '18224091291', '1', '', '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (47, 108, '15196615885', '余思翰', '00', '', '15196615885', '1', '', '$2a$10$IjogDx43u3xmI2TigAo6CugCKh.AAmwOSf1nKBCWlJ/cEhgpX.H3e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (48, 108, '17716873691', '阮梦妍', '00', '', '17716873691', '1', '', '$2a$10$XXlN3NzrRMBmMudrV3ZgOOtEq.RML/KrrVhN/uh.rpP7chAqy8QTe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (49, 108, '15881196342', '赵   芩', '00', '', '15881196342', '1', '', '$2a$10$x2pMljHso1uFHnjDpFu0/OPGrU1ITvl7hnv/bwFFQVUIH/mQ39k2G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (50, 108, '18502889383', '王荣华', '00', '', '18502889383', '0', '', '$2a$10$G7uXmOzRgagbI2jske8meuu8p0QgvTvMxLDzV0gQWHVaKJTsW6e3i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (51, 108, '19982093641', '屈亚星', '00', '', '19982093641', '1', '', '$2a$10$gklMWtGS2E8tdWakJpNk9OyEv2g/2MGuQupEH0Q7zCpZI9XJPMxyC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (52, 109, '13880509805', '吴   凯', '00', '', '13880509805', '0', '', '$2a$10$AN5g8asAyLLW9.POKvkh8.WPCKqzf4Ze71ltLA.wIbEqIH3fQSj0q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (53, 109, '13981911565', '李   旭', '00', '', '13981911565', '0', '', '$2a$10$j4GUGW8LwJVW5kS98xis3.PYbeMsqjJwiJBnmj1lYpS04hqp7IvMi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (54, 109, '13708077449', '马如坤', '00', '', '13708077449', '0', '', '$2a$10$SO9HTWCXPMBbHiMUs73YdON7RYGfi0LbB/Tfyq5e7BZaxSbJvTB3S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (55, 109, '13684088875', '张   进', '00', '', '13684088875', '0', '', '$2a$10$TMJoxh5FamkqFR7crz.eh.1/jwx9JdyAm9SAE/wzZdwgzfqjljvGC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (56, 109, '13550225550', '冉洪芳', '00', '', '13550225550', '1', '', '$2a$10$N0iuZU3JhPqLBogqtMbmeuL1aGb/D3E0Yh3UUoJX6yV.iaVT1WBhq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (57, 109, '13880738350', '周文婷', '00', '', '13880738350', '1', '', '$2a$10$Z8hiF47EMxhCXq9I/xbLbuJloSnoARKeiRgodgBcer7lq1VsYE3fC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (58, 109, '13558636992', '谭   君', '00', '', '13558636992', '1', '', '$2a$10$uBsL6WPQpYCbT0oddsoll.VrLlMDrRWU2my.VdnNovu9c.thOXR1e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (59, 109, '13658078979', '王晶丽', '00', '', '13658078979', '1', '', '$2a$10$PBNCy8SQPudxBTigEEXVAuIot2PoUDMz6KV1u8TeXBvXiS0CAUMtW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (60, 109, '13488986700', '罗业华', '00', '', '13488986700', '0', '', '$2a$10$8np5PzaPEkMQwRYUzSnUX.pDQSRdbpFXyzhtYvBj11OzTaNmGAEtG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (61, 109, '13540297596', '郎悟灵', '00', '', '13540297596', '1', '', '$2a$10$BU3usTExEEbFa7VGIbnOgeAJ3CsJXPkzV6ZTH2xRtu70Es76RP5j.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (62, 109, '18030862435', '黄俊峰', '00', '', '18030862435', '0', '', '$2a$10$gBqKUDSxjc4mHUp6Pcrp8evF1BVhgkpq8cm65iqWtHkkDP1wk/Jaa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (63, 110, '15881027005', '赵   洪', '00', '', '15881027005', '0', '', '$2a$10$HbyEXT7JR0HMv/rqi9YuQOKCyDxZg/uYgayoSOcE2.tDSVNS0OBpW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (64, 110, '18782047395', '雷情情', '00', '', '18782047395', '1', '', '$2a$10$DLeq2ePfvTS9cAarUu87LuM8d1nwJR5t/OBI3kc5nT858nIo0vpR2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (65, 110, '13668275672', '刘向东', '00', '', '13668275672', '0', '', '$2a$10$GUkGxa.u4jsBVE5mAXVTcetM0t6JIxMPUthi6v5IitkVSZUlpzf5.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (66, 110, '13880738396', '徐志勇', '00', '', '13880738396', '0', '', '$2a$10$toSkneflSQedWXrjbim6lut03gEx1HlV4FV1UFYocdtDpEhpbbLam', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (67, 110, '15828108217', '李   敏', '00', '', '15828108217', '1', '', '$2a$10$c8ADHg87uPh0KaTXl.hWm.5z4hVDRtFmTprgfAJ1y.yVj27mEvV8i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (68, 110, '13689063294', '何   玲', '00', '', '13689063294', '1', '', '$2a$10$v1/ZnLyGAQwuQ7fUjy/kdeklmPo7e3uR/ogj5KmvjIPEQF7mqM/BS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (69, 110, '15982266763', '谭天宇', '00', '', '15982266763', '0', '', '$2a$10$QNa18og32fQ979WGRWGFTOLgHszwXzvE.a9dSnuqMqQ4hABt5MBRa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (70, 110, '18384964273', '李丽昕', '00', '', '18384964273', '1', '', '$2a$10$f7M7gFzNtCxjBCDZjXlvz.ROHw7vedqYtpX1BRLmT9X/5OouCXna2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (71, 110, '15108259951', '陈   波', '00', '', '15108259951', '0', '', '$2a$10$nkbLOjwcHqge.kwX4bTSWOxX6owLTazGVVrthxxPiun9zLP8NpYTW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (72, 110, '18483229925', '张   敏', '00', '', '18483229925', '1', '', '$2a$10$UodO6Pu05eUct21vfnuQIOIwHhuEw3xkmZPEFjaeP378YoiQ/86Ee', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (73, 110, '15308209119', '李   磊', '00', '', '15308209119', '0', '', '$2a$10$DYNX/J5XG6CCniWthrA3KOau0kWEw8gtMSnS7dhtofuCpZLQfyRsG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (74, 110, '18190687602', '杨为康', '00', '', '18190687602', '0', '', '$2a$10$Vzo2gOmvHdI6TZxZCO2iTePU8fa9oVN6xPmyT2ZapQ2sZEJRM.tWa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (75, 110, '15202868564', '夏志斌', '00', '', '15202868564', '0', '', '$2a$10$ucCDdz5DYNZy64aKKSxH/.Lib./7T5rLGECIWXzwBLalCQk0X1fka', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (76, 110, '18048613219', '刘轩庭', '00', '', '18048613219', '0', '', '$2a$10$.pSSK43SDZGc3tt1sjZREe/d0hCAbHpmUKvyFzJ1vtctvSZpdf.ka', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (77, 110, '18482156612', '廖友福', '00', '', '18482156612', '0', '', '$2a$10$47nqvaqoPpAbcR9wH.ar9.nBCbKshOpTP0HwgBxsFWt3wqSaW/U0y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (78, 110, '13880417112', '潘林海', '00', '', '13880417112', '0', '', '$2a$10$z1iuKFb6q9SSiXoELcrfjuYWLnAbPorD42T.5nCEmLUXwL0/Ahe8m', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (79, 110, '13518119939', '邓锡全', '00', '', '13518119939', '0', '', '$2a$10$auJq1XFdaj.2.WXKS98mxOWcprpL3LGl5h3Fd1sBwAoUfh1c6zlrK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (80, 110, '15208122776', '张   杰', '00', '', '15208122776', '0', '', '$2a$10$HcC7iiq4GR1Ca0JRrJntOemcBW3vO.tt9/EUbmvQJ9M.QIs1j6IJC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (81, 110, '17345094889', '廖   双', '00', '', '17345094889', '0', '', '$2a$10$AA3hI9GxRBB3XD9N/NthD.nqYf487wG3BvJQgYsSTublKos1Gy1Km', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (82, 110, '15520996706', '廖吉兴', '00', '', '15520996706', '0', '', '$2a$10$/KNuVYgY/iKADZZg.iykyuJK/rrgi/CpbZy.ZFv3NKm4MrpqBnCFu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (83, 110, '15692823805', '王海宾', '00', '', '15692823805', '0', '', '$2a$10$OF1jB2LgFMeaakI6NTPqx.nTTe4bKzZeaP9dYccOk0v0rdCzja7Jy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (84, 111, '13540773353', '杨   振', '00', '', '13540773353', '0', '', '$2a$10$m8MnVkkjv9DT7GRaVDfG9e0lQM79NJPBwFQL3eckGh32qylKlNeky', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (85, 111, '18380220140', '甘雨婷', '00', '', '18380220140', '1', '', '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (86, 111, '13608005983', '周   强', '00', '', '13608005983', '0', '', '$2a$10$jIiDO3ighwg51nlJe4WbZet365ysf61KTuqrDNsF9YD90fHAMf9cy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (87, 111, '13540422960', '邹   霞', '00', '', '13540422960', '1', '', '$2a$10$JGmiiO3vjhEF5e2BXubE1uE/DRzpcmK3SMBZo/EDExsd8L9TWqEHm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (88, 111, '13488985627', '罗声燕', '00', '', '13488985627', '1', '', '$2a$10$.lFR.S8c/i3550O88zhk4OIyeYF2vmulknGqBvE/hi8b9id1RLNry', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (89, 111, '18227609102', '王   琴', '00', '', '18227609102', '1', '', '$2a$10$hW41I3wMpnM.GiPO85jv3eyr6uJglfpj2SV/fU9etfXuBjHgIIveO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (90, 111, '15281034798', '李   静', '00', '', '15281034798', '1', '', '$2a$10$BIV.X9sgXwCLmnx0MjvbN.xnJ0d9mSv7Fe1HsB.d5UvqhYBux4aRK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (91, 111, '18380143305', '刘   垚', '00', '', '18380143305', '1', '', '$2a$10$9pXNh3pit.p.3lCv.1vIAeqm594O0y2ycUVTK5aXqbf1.DD9ckHr6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (92, 111, '15208298451', '李   杨', '00', '', '15208298451', '0', '', '$2a$10$K25fAdfUGilTZz9BHlKBnezcMkD/Pv.uJKM1H0/jn.cOOas5jDVea', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (93, 111, '18990913384', '朱   姝', '00', '', '18990913384', '1', '', '$2a$10$GXcpkSxBeuM1tj66W6M50.YPQKMOccRTD64wikP5LuRW0PMhJ2Z5q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (94, 111, '18483229950', '唐   浩', '00', '', '18483229950', '0', '', '$2a$10$B..WW48a/JzGIgxdKoQEuu70YDGVmqJf/PV/WzcWjhatTZMA9Ch..', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (95, 111, '15108355309', '张   韦', '00', '', '15108355309', '0', '', '$2a$10$2aepTeKqlbUhb1x6i0K88OxLlZohvIf5JZ2xhgZO8It5MagkvLHHC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (96, 111, '18108260500', '黄建春', '00', '', '18108260500', '0', '', '$2a$10$sfPuHSWY3AytrF7.o/cMAeXwb.GU1/wk4VJw4FLKgEnLNKlMdIRee', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (97, 111, '13881755761', '廖绍毅', '00', '', '13881755761', '0', '', '$2a$10$g9/NOZbNS6eIcqnEg6Z2geNyQIMNJtTJrahTvIYeDis68GaQ.McJG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (98, 111, '15700353317', '杨   晶', '00', '', '15700353317', '0', '', '$2a$10$Efj2FINLArOIOgEKa3vqp.k0gpwmJKlWWlXwTrQmSIO2qsVlIWZAa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (99, 111, '13618069959', '蒋剑虹', '00', '', '13618069959', '0', '', '$2a$10$5osgmB9ZInuTYvyMUedKqe2aDJM91i/KjOxGWWCZb9WO/45U7Zok.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (100, 111, '13882487125', '赵明焱', '00', '', '13882487125', '0', '', '$2a$10$zs4QH/xd0JDuYgrftHUhRedB5SWCE.d7pdTxhUmdo/OYVxx2fSFWq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (101, 111, '18228226661', '董旭鹏', '00', '', '18228226661', '0', '', '$2a$10$yaBpFaISskiafcOa/k28VeSQSMiYhCxbtmMoXN/fruESTkMs4RwA6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (102, 111, '15775308748', '邓汶滨', '00', '', '15775308748', '0', '', '$2a$10$5L36DYl/Q.wmGKsolG/x0u4vnK78sVY59Qjx6fQA3z9n4dl62ykM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (103, 112, '13688460154', '周   全', '00', '', '13688460154', '0', '', '$2a$10$TQMgM2lTRkeTB4YY5IHQ0.xvCGZlnd774UdWe.OPGElTkRuLAsEz6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (104, 112, '13688404696', '柏金川', '00', '', '13688404696', '0', '', '$2a$10$4ih05H.SB537jI2sHx756.hQvWBbm.4ViXs7HFKndjDQDCyvYz1rO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (32, 106, '18828096127', '朱   静', '00', '', '18828096127', '0', '', '$2a$10$PrXuWRk4u9d05TNI9MAGjeGwmsSglOtGNKX.fjDuRwmTfVSFr4x9C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (33, 106, '13882148315', '陈尚云', '00', '', '13882148315', '0', '', '$2a$10$I7CDnjCXqmbFmxdgcsoZ/uhgvEahRGZ/u3P4bdIU1Kic49Itu97JG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (34, 106, '18113169528', '蒲   帆', '00', '', '18113169528', '0', '', '$2a$10$Z.3Y46kvgMCHpVSsXl3WJO4OOLJhr5IlzXTQqWx1a8yR1HaJQJQQW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (35, 106, '18408201550', '邹帅民', '00', '', '18408201550', '0', '', '$2a$10$VC/JGLy.P6yJ5LJHmuq2dur.wnHYDzzxjyaizC8fYVNRq5DBmjjIm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (36, 106, '13808178930', '周   芝', '00', '', '13808178930', '1', '', '$2a$10$4SuEJ.5YZSnk3UlpISWBmer7UZVMBKuMNBiG2/lUKafwNr1jI1UF2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (37, 106, '18780290087', '苟   旭', '00', '', '18780290087', '0', '', '$2a$10$QCU/ERPaKSs5CAuWWB2WZ.13fxht6GKgGORCBS8DUy3qBmJybgzM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (38, 107, '18280462009', '刘媛媛', '00', '', '18280462009', '1', '', '$2a$10$SWNBLt43nQQJPC58DZmZcuHqkhre8lOMfl87AnM5UKuMrMfuPpaO6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (39, 107, '18200194440', '吴   振', '00', '', '18200194440', '0', '', '$2a$10$a3ozNbqM6BYYISEJGIpx5O83L1RpMXNc4A9gpPu93qZ9PahUzx24u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (40, 107, '15892280776', '王   刚', '00', '', '15892280776', '0', '', '$2a$10$ulhCOUUylhfnX7iccme6I.zpwLdnvU3zXXuMJ9LtRILnviD6Pvg9u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (41, 107, '18140026972', '朱倪强', '00', '', '18140026972', '0', '', '$2a$10$HLRPkMz/orRnHouLjKNoH.Mn..dH97urH6up1x5AO0ZmtL64wp5XG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (42, 107, '18408248664', '李   圆', '00', '', '18408248664', '1', '', '$2a$10$nMUdzmsF1Tk1FOR7k92kMulRN31LkiWV45F3eAAvNwCS8acu9endK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (43, 107, '18783205676', '李泳龙', '00', '', '18783205676', '0', '', '$2a$10$LHQQe3UHQgaJDCnPl.gujuBKgRhrMN88kPKRxev2HSvOrV2IDRAfG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (44, 108, '13402863790', '何   杰', '00', '', '13402863790', '0', '', '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (45, 108, '18224091291', '杨玉婧', '00', '', '18224091291', '1', '', '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (46, 108, '15196615885', '余思翰', '00', '', '15196615885', '1', '', '$2a$10$IjogDx43u3xmI2TigAo6CugCKh.AAmwOSf1nKBCWlJ/cEhgpX.H3e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (47, 108, '17716873691', '阮梦妍', '00', '', '17716873691', '1', '', '$2a$10$XXlN3NzrRMBmMudrV3ZgOOtEq.RML/KrrVhN/uh.rpP7chAqy8QTe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (48, 108, '15881196342', '赵   芩', '00', '', '15881196342', '1', '', '$2a$10$x2pMljHso1uFHnjDpFu0/OPGrU1ITvl7hnv/bwFFQVUIH/mQ39k2G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (49, 108, '18502889383', '王荣华', '00', '', '18502889383', '0', '', '$2a$10$G7uXmOzRgagbI2jske8meuu8p0QgvTvMxLDzV0gQWHVaKJTsW6e3i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (50, 108, '19982093641', '屈亚星', '00', '', '19982093641', '1', '', '$2a$10$gklMWtGS2E8tdWakJpNk9OyEv2g/2MGuQupEH0Q7zCpZI9XJPMxyC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (51, 109, '13880509805', '吴   凯', '00', '', '13880509805', '0', '', '$2a$10$AN5g8asAyLLW9.POKvkh8.WPCKqzf4Ze71ltLA.wIbEqIH3fQSj0q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (52, 109, '13981911565', '李   旭', '00', '', '13981911565', '0', '', '$2a$10$j4GUGW8LwJVW5kS98xis3.PYbeMsqjJwiJBnmj1lYpS04hqp7IvMi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (53, 109, '13708077449', '马如坤', '00', '', '13708077449', '0', '', '$2a$10$SO9HTWCXPMBbHiMUs73YdON7RYGfi0LbB/Tfyq5e7BZaxSbJvTB3S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (54, 109, '13684088875', '张   进', '00', '', '13684088875', '0', '', '$2a$10$TMJoxh5FamkqFR7crz.eh.1/jwx9JdyAm9SAE/wzZdwgzfqjljvGC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (55, 109, '13550225550', '冉洪芳', '00', '', '13550225550', '1', '', '$2a$10$N0iuZU3JhPqLBogqtMbmeuL1aGb/D3E0Yh3UUoJX6yV.iaVT1WBhq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (56, 109, '13880738350', '周文婷', '00', '', '13880738350', '1', '', '$2a$10$Z8hiF47EMxhCXq9I/xbLbuJloSnoARKeiRgodgBcer7lq1VsYE3fC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (57, 109, '13558636992', '谭   君', '00', '', '13558636992', '1', '', '$2a$10$uBsL6WPQpYCbT0oddsoll.VrLlMDrRWU2my.VdnNovu9c.thOXR1e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (58, 109, '13658078979', '王晶丽', '00', '', '13658078979', '1', '', '$2a$10$PBNCy8SQPudxBTigEEXVAuIot2PoUDMz6KV1u8TeXBvXiS0CAUMtW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (59, 109, '13488986700', '罗业华', '00', '', '13488986700', '0', '', '$2a$10$8np5PzaPEkMQwRYUzSnUX.pDQSRdbpFXyzhtYvBj11OzTaNmGAEtG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (60, 109, '13540297596', '郎悟灵', '00', '', '13540297596', '1', '', '$2a$10$BU3usTExEEbFa7VGIbnOgeAJ3CsJXPkzV6ZTH2xRtu70Es76RP5j.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (61, 109, '18030862435', '黄俊峰', '00', '', '18030862435', '0', '', '$2a$10$gBqKUDSxjc4mHUp6Pcrp8evF1BVhgkpq8cm65iqWtHkkDP1wk/Jaa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (62, 110, '15881027005', '赵   洪', '00', '', '15881027005', '0', '', '$2a$10$HbyEXT7JR0HMv/rqi9YuQOKCyDxZg/uYgayoSOcE2.tDSVNS0OBpW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (63, 110, '18782047395', '雷情情', '00', '', '18782047395', '1', '', '$2a$10$DLeq2ePfvTS9cAarUu87LuM8d1nwJR5t/OBI3kc5nT858nIo0vpR2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (64, 110, '13668275672', '刘向东', '00', '', '13668275672', '0', '', '$2a$10$GUkGxa.u4jsBVE5mAXVTcetM0t6JIxMPUthi6v5IitkVSZUlpzf5.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (65, 110, '13880738396', '徐志勇', '00', '', '13880738396', '0', '', '$2a$10$toSkneflSQedWXrjbim6lut03gEx1HlV4FV1UFYocdtDpEhpbbLam', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (66, 110, '15828108217', '李   敏', '00', '', '15828108217', '1', '', '$2a$10$c8ADHg87uPh0KaTXl.hWm.5z4hVDRtFmTprgfAJ1y.yVj27mEvV8i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (67, 110, '13689063294', '何   玲', '00', '', '13689063294', '1', '', '$2a$10$v1/ZnLyGAQwuQ7fUjy/kdeklmPo7e3uR/ogj5KmvjIPEQF7mqM/BS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (68, 110, '15982266763', '谭天宇', '00', '', '15982266763', '0', '', '$2a$10$QNa18og32fQ979WGRWGFTOLgHszwXzvE.a9dSnuqMqQ4hABt5MBRa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (69, 110, '18384964273', '李丽昕', '00', '', '18384964273', '1', '', '$2a$10$f7M7gFzNtCxjBCDZjXlvz.ROHw7vedqYtpX1BRLmT9X/5OouCXna2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (70, 110, '15108259951', '陈   波', '00', '', '15108259951', '0', '', '$2a$10$nkbLOjwcHqge.kwX4bTSWOxX6owLTazGVVrthxxPiun9zLP8NpYTW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (71, 110, '18483229925', '张   敏', '00', '', '18483229925', '1', '', '$2a$10$UodO6Pu05eUct21vfnuQIOIwHhuEw3xkmZPEFjaeP378YoiQ/86Ee', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (72, 110, '15308209119', '李   磊', '00', '', '15308209119', '0', '', '$2a$10$DYNX/J5XG6CCniWthrA3KOau0kWEw8gtMSnS7dhtofuCpZLQfyRsG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (73, 110, '18190687602', '杨为康', '00', '', '18190687602', '0', '', '$2a$10$Vzo2gOmvHdI6TZxZCO2iTePU8fa9oVN6xPmyT2ZapQ2sZEJRM.tWa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (74, 110, '15202868564', '夏志斌', '00', '', '15202868564', '0', '', '$2a$10$ucCDdz5DYNZy64aKKSxH/.Lib./7T5rLGECIWXzwBLalCQk0X1fka', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (75, 110, '18048613219', '刘轩庭', '00', '', '18048613219', '0', '', '$2a$10$.pSSK43SDZGc3tt1sjZREe/d0hCAbHpmUKvyFzJ1vtctvSZpdf.ka', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (76, 110, '18482156612', '廖友福', '00', '', '18482156612', '0', '', '$2a$10$47nqvaqoPpAbcR9wH.ar9.nBCbKshOpTP0HwgBxsFWt3wqSaW/U0y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (77, 110, '13880417112', '潘林海', '00', '', '13880417112', '0', '', '$2a$10$z1iuKFb6q9SSiXoELcrfjuYWLnAbPorD42T.5nCEmLUXwL0/Ahe8m', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (78, 110, '13518119939', '邓锡全', '00', '', '13518119939', '0', '', '$2a$10$auJq1XFdaj.2.WXKS98mxOWcprpL3LGl5h3Fd1sBwAoUfh1c6zlrK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (79, 110, '15208122776', '张   杰', '00', '', '15208122776', '0', '', '$2a$10$HcC7iiq4GR1Ca0JRrJntOemcBW3vO.tt9/EUbmvQJ9M.QIs1j6IJC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (80, 110, '17345094889', '廖   双', '00', '', '17345094889', '0', '', '$2a$10$AA3hI9GxRBB3XD9N/NthD.nqYf487wG3BvJQgYsSTublKos1Gy1Km', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (81, 110, '15520996706', '廖吉兴', '00', '', '15520996706', '0', '', '$2a$10$/KNuVYgY/iKADZZg.iykyuJK/rrgi/CpbZy.ZFv3NKm4MrpqBnCFu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (82, 110, '15692823805', '王海宾', '00', '', '15692823805', '0', '', '$2a$10$OF1jB2LgFMeaakI6NTPqx.nTTe4bKzZeaP9dYccOk0v0rdCzja7Jy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (83, 111, '13540773353', '杨   振', '00', '', '13540773353', '0', '', '$2a$10$m8MnVkkjv9DT7GRaVDfG9e0lQM79NJPBwFQL3eckGh32qylKlNeky', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (84, 111, '18380220140', '甘雨婷', '00', '', '18380220140', '1', '', '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (85, 111, '13608005983', '周   强', '00', '', '13608005983', '0', '', '$2a$10$jIiDO3ighwg51nlJe4WbZet365ysf61KTuqrDNsF9YD90fHAMf9cy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (86, 111, '13540422960', '邹   霞', '00', '', '13540422960', '1', '', '$2a$10$JGmiiO3vjhEF5e2BXubE1uE/DRzpcmK3SMBZo/EDExsd8L9TWqEHm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (87, 111, '13488985627', '罗声燕', '00', '', '13488985627', '1', '', '$2a$10$.lFR.S8c/i3550O88zhk4OIyeYF2vmulknGqBvE/hi8b9id1RLNry', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (88, 111, '18227609102', '王   琴', '00', '', '18227609102', '1', '', '$2a$10$hW41I3wMpnM.GiPO85jv3eyr6uJglfpj2SV/fU9etfXuBjHgIIveO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (89, 111, '15281034798', '李   静', '00', '', '15281034798', '1', '', '$2a$10$BIV.X9sgXwCLmnx0MjvbN.xnJ0d9mSv7Fe1HsB.d5UvqhYBux4aRK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (90, 111, '18380143305', '刘   垚', '00', '', '18380143305', '1', '', '$2a$10$9pXNh3pit.p.3lCv.1vIAeqm594O0y2ycUVTK5aXqbf1.DD9ckHr6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (91, 111, '15208298451', '李   杨', '00', '', '15208298451', '0', '', '$2a$10$K25fAdfUGilTZz9BHlKBnezcMkD/Pv.uJKM1H0/jn.cOOas5jDVea', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (92, 111, '18990913384', '朱   姝', '00', '', '18990913384', '1', '', '$2a$10$GXcpkSxBeuM1tj66W6M50.YPQKMOccRTD64wikP5LuRW0PMhJ2Z5q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (93, 111, '18483229950', '唐   浩', '00', '', '18483229950', '0', '', '$2a$10$B..WW48a/JzGIgxdKoQEuu70YDGVmqJf/PV/WzcWjhatTZMA9Ch..', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (94, 111, '15108355309', '张   韦', '00', '', '15108355309', '0', '', '$2a$10$2aepTeKqlbUhb1x6i0K88OxLlZohvIf5JZ2xhgZO8It5MagkvLHHC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (95, 111, '18108260500', '黄建春', '00', '', '18108260500', '0', '', '$2a$10$sfPuHSWY3AytrF7.o/cMAeXwb.GU1/wk4VJw4FLKgEnLNKlMdIRee', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (96, 111, '13881755761', '廖绍毅', '00', '', '13881755761', '0', '', '$2a$10$g9/NOZbNS6eIcqnEg6Z2geNyQIMNJtTJrahTvIYeDis68GaQ.McJG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (97, 111, '15700353317', '杨   晶', '00', '', '15700353317', '0', '', '$2a$10$Efj2FINLArOIOgEKa3vqp.k0gpwmJKlWWlXwTrQmSIO2qsVlIWZAa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (98, 111, '13618069959', '蒋剑虹', '00', '', '13618069959', '0', '', '$2a$10$5osgmB9ZInuTYvyMUedKqe2aDJM91i/KjOxGWWCZb9WO/45U7Zok.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (99, 111, '13882487125', '赵明焱', '00', '', '13882487125', '0', '', '$2a$10$zs4QH/xd0JDuYgrftHUhRedB5SWCE.d7pdTxhUmdo/OYVxx2fSFWq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (100, 111, '18228226661', '董旭鹏', '00', '', '18228226661', '0', '', '$2a$10$yaBpFaISskiafcOa/k28VeSQSMiYhCxbtmMoXN/fruESTkMs4RwA6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (101, 111, '15775308748', '邓汶滨', '00', '', '15775308748', '0', '', '$2a$10$5L36DYl/Q.wmGKsolG/x0u4vnK78sVY59Qjx6fQA3z9n4dl62ykM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (102, 112, '13688460154', '周   全', '00', '', '13688460154', '0', '', '$2a$10$TQMgM2lTRkeTB4YY5IHQ0.xvCGZlnd774UdWe.OPGElTkRuLAsEz6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (103, 112, '13688404696', '柏金川', '00', '', '13688404696', '0', '', '$2a$10$4ih05H.SB537jI2sHx756.hQvWBbm.4ViXs7HFKndjDQDCyvYz1rO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (104, 112, '15802829286', '向艳雄', '00', '', '15802829286', '0', '', '$2a$10$FQo1zf1ss2OZw4eIlzzxwOyPV0FkkLDN0ZBxqRSIijNpUCCSxBjQy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (105, 112, '13594658239', '黄安堂', '00', '', '13594658239', '0', '', '$2a$10$uSefDVQx.kottALOIZptjO0RnZhvITS4QTnXjSBJddqYfOftdZ8Pa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (106, 112, '13408566079', '李学勇', '00', '', '13408566079', '0', '', '$2a$10$8ru4dmjHBh21h8C3FTpdMeqsG4RHVyvqmqUFRFCDCUok2uH2ZLjiy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (107, 112, '15881283512', '陈俊恺', '00', '', '15881283512', '0', '', '$2a$10$eqX3G0LjlptoBsMefxIjXuzSEaq5opPJjzqoitrp4Dhun3u1o1F1i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
@@ -785,44 +785,44 @@ insert into sys_user_post values (24, 23);
 insert into sys_user_post values (25, 23);
 insert into sys_user_post values (26, 23);
 insert into sys_user_post values (27, 23);
-insert into sys_user_post values (28, 25);
-insert into sys_user_post values (29, 24);
+insert into sys_user_post values (28, 13);
+insert into sys_user_post values (29, 25);
 insert into sys_user_post values (30, 24);
 insert into sys_user_post values (31, 25);
 insert into sys_user_post values (32, 12);
-insert into sys_user_post values (33, 13);
-insert into sys_user_post values (34, 11);
+insert into sys_user_post values (33, 11);
+insert into sys_user_post values (34, 21);
 insert into sys_user_post values (35, 21);
-insert into sys_user_post values (36, 21);
-insert into sys_user_post values (37, 23);
-insert into sys_user_post values (38, 21);
-insert into sys_user_post values (39, 12);
-insert into sys_user_post values (40, 13);
+insert into sys_user_post values (36, 23);
+insert into sys_user_post values (37, 21);
+insert into sys_user_post values (38, 12);
+insert into sys_user_post values (39, 13);
+insert into sys_user_post values (40, 26);
 insert into sys_user_post values (41, 26);
 insert into sys_user_post values (42, 26);
 insert into sys_user_post values (43, 26);
-insert into sys_user_post values (44, 26);
-insert into sys_user_post values (45, 12);
+insert into sys_user_post values (44, 12);
+insert into sys_user_post values (45, 26);
 insert into sys_user_post values (46, 26);
 insert into sys_user_post values (47, 26);
 insert into sys_user_post values (48, 26);
 insert into sys_user_post values (49, 26);
 insert into sys_user_post values (50, 26);
-insert into sys_user_post values (51, 26);
+insert into sys_user_post values (51, 11);
+insert into sys_user_post values (51, 12);
 insert into sys_user_post values (52, 11);
-insert into sys_user_post values (52, 12);
-insert into sys_user_post values (53, 11);
-insert into sys_user_post values (54, 11);
+insert into sys_user_post values (53, 5);
+insert into sys_user_post values (54, 14);
 insert into sys_user_post values (55, 14);
-insert into sys_user_post values (56, 14);
+insert into sys_user_post values (56, 26);
 insert into sys_user_post values (57, 26);
 insert into sys_user_post values (58, 26);
 insert into sys_user_post values (59, 26);
 insert into sys_user_post values (60, 26);
 insert into sys_user_post values (61, 26);
-insert into sys_user_post values (62, 26);
+insert into sys_user_post values (62, 13);
 insert into sys_user_post values (63, 13);
-insert into sys_user_post values (64, 13);
+insert into sys_user_post values (64, 26);
 insert into sys_user_post values (65, 26);
 insert into sys_user_post values (66, 26);
 insert into sys_user_post values (67, 26);
@@ -841,9 +841,9 @@ insert into sys_user_post values (79, 26);
 insert into sys_user_post values (80, 26);
 insert into sys_user_post values (81, 26);
 insert into sys_user_post values (82, 26);
-insert into sys_user_post values (83, 26);
-insert into sys_user_post values (84, 12);
-insert into sys_user_post values (85, 13);
+insert into sys_user_post values (83, 12);
+insert into sys_user_post values (84, 13);
+insert into sys_user_post values (85, 26);
 insert into sys_user_post values (86, 26);
 insert into sys_user_post values (87, 26);
 insert into sys_user_post values (88, 26);
@@ -860,9 +860,9 @@ insert into sys_user_post values (98, 26);
 insert into sys_user_post values (99, 26);
 insert into sys_user_post values (100, 26);
 insert into sys_user_post values (101, 26);
-insert into sys_user_post values (102, 26);
-insert into sys_user_post values (103, 12);
-insert into sys_user_post values (104, 13);
+insert into sys_user_post values (102, 12);
+insert into sys_user_post values (103, 13);
+insert into sys_user_post values (104, 26);
 insert into sys_user_post values (105, 26);
 insert into sys_user_post values (106, 26);
 insert into sys_user_post values (107, 26);
@@ -898,7 +898,7 @@ insert into sys_user_post values (136, 27);
 insert into sys_user_post values (137, 27);
 insert into sys_user_post values (138, 27);
 insert into sys_user_post values (139, 27);
-insert into sys_user_post values (140, 16);
+insert into sys_user_post values (140, 15);
 insert into sys_user_post values (141, 26);
 insert into sys_user_post values (142, 26);
 insert into sys_user_post values (143, 1);
@@ -1032,66 +1032,69 @@ insert into sys_dict_data values (29, 2, '失败', '1', 'sys_common_status', '',
 insert into sys_dict_data values (30, 0, '一级', '0', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:30', '', null, null);
 insert into sys_dict_data values (31, 1, '二级', '1', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:42', '', null, null);
 insert into sys_dict_data values (32, 2, '三级', '2', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:57', '', null, null);
-insert into sys_dict_data values (33, 0, '二岗', '0', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:24', '', null, null);
-insert into sys_dict_data values (34, 1, '三岗', '1', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:37', '', null, null);
-insert into sys_dict_data values (35, 2, '四岗', '2', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:02', '', null, null);
-insert into sys_dict_data values (36, 3, '五岗', '3', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:24', '', null, null);
-insert into sys_dict_data values (37, 4, '六岗', '4', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:35', '', null, null);
-insert into sys_dict_data values (38, 0, '正高', '0', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
-insert into sys_dict_data values (39, 1, '副高', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
-insert into sys_dict_data values (40, 2, '中级', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
-insert into sys_dict_data values (41, 3, '助工', '3', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
-insert into sys_dict_data values (42, 4, '注册测绘师', '4', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:30', '', null, null);
-insert into sys_dict_data values (43, 5, '注册城乡规划师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:11', '', null, null);
-insert into sys_dict_data values (44, 6, '注册岩土工程师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:58', '', null, null);
-insert into sys_dict_data values (45, 7, '注册安全工程师', '7', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:13', '', null, null);
-insert into sys_dict_data values (46, 8, '注册会计师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:36', '', null, null);
-insert into sys_dict_data values (47, 0, '不合格', '0', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:47', '', null, null);
-insert into sys_dict_data values (48, 1, '合格', '1', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:56', '', null, null);
-insert into sys_dict_data values (49, 2, '良好', '2', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:08', '', null, null);
-insert into sys_dict_data values (50, 3, '优秀', '3', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:23', '', null, null);
-insert into sys_dict_data values (51, 0, '生疏', '0', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:12', '', null, null);
-insert into sys_dict_data values (52, 1, '较熟练', '1', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:20', '', null, null);
-insert into sys_dict_data values (53, 2, '熟练', '2', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:28', '', null, null);
-insert into sys_dict_data values (54, 3, '精通', '3', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:06', '', null, null);
-insert into sys_dict_data values (55, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
-insert into sys_dict_data values (56, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
-insert into sys_dict_data values (57, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
-insert into sys_dict_data values (58, 0, '主办', '00', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
-insert into sys_dict_data values (59, 1, '参与', '01', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
-insert into sys_dict_data values (60, 2, '协办', '02', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
-insert into sys_dict_data values (61, 3, '常规项目', '03', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
-insert into sys_dict_data values (62, 4, '监测项目', '04', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
-insert into sys_dict_data values (63, 5, '调查项目', '05', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
-insert into sys_dict_data values (64, 6, '测量项目', '06', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
-insert into sys_dict_data values (65, 7, '其他项目', '07', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
-insert into sys_dict_data values (66, 8, '选点', '08', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
-insert into sys_dict_data values (67, 9, '埋石', '09', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
-insert into sys_dict_data values (68, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, null);
-insert into sys_dict_data values (69, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, null);
-insert into sys_dict_data values (70, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, null);
-insert into sys_dict_data values (71, 13, '负责', '13', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:41', '', null, null);
-insert into sys_dict_data values (72, 14, '前视', '14', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:05', '', null, null);
-insert into sys_dict_data values (73, 15, '后视', '15', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:14', '', null, null);
-insert into sys_dict_data values (74, 16, '水准', '16', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:38', '', null, null);
-insert into sys_dict_data values (75, 17, '三角高程', '17', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:52', '', null, null);
-insert into sys_dict_data values (76, 18, '实测', '18', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:09', '', null, null);
-insert into sys_dict_data values (77, 19, '相控', '19', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:29', '', null, null);
-insert into sys_dict_data values (78, 20, '调绘', '20', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:31:53', '', null, null);
-insert into sys_dict_data values (79, 21, '测量', '21', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:32:57', '', null, null);
-insert into sys_dict_data values (80, 22, '整理', '22', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:33:08', '', null, null);
-insert into sys_dict_data values (81, 23, '主飞', '23', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:22', '', null, null);
-insert into sys_dict_data values (82, 24, '协飞', '24', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:48', '', null, null);
-insert into sys_dict_data values (83, 25, '作业', '25', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:43:01', '', null, null);
-insert into sys_dict_data values (84, 26, '检查', '26', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:44:59', '', null, null);
-insert into sys_dict_data values (85, 27, '负责', '27', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:45:12', '', null, null);
-insert into sys_dict_data values (86, 28, '空三', '28', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:14', '', null, null);
-insert into sys_dict_data values (87, 29, '建模', '29', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:42', '', null, null);
-insert into sys_dict_data values (88, 30, '修模', '30', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:55', '', null, null);
-insert into sys_dict_data values (89, 0, '傲视', '0', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:35', '', null, null);
-insert into sys_dict_data values (90, 1, '飞马', '1', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:46', '', null, null);
-insert into sys_dict_data values (91, 2, '华测', '2', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:56', '', null, null);
-insert into sys_dict_data values (92, 3, '其他', '3', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:36:03', '', null, null);
+insert into sys_dict_data values (33, 0, '一岗', '0', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:14', '', null, null);
+insert into sys_dict_data values (34, 1, '二岗', '1', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:24', '', null, null);
+insert into sys_dict_data values (35, 2, '三岗', '2', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:37', '', null, null);
+insert into sys_dict_data values (36, 3, '四岗', '3', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:02', '', null, null);
+insert into sys_dict_data values (37, 4, '五岗', '4', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:24', '', null, null);
+insert into sys_dict_data values (38, 5, '六岗', '5', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:35', '', null, null);
+insert into sys_dict_data values (39, 6, '七岗', '6', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:44', '', null, null);
+insert into sys_dict_data values (40, 7, '八岗', '7', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+insert into sys_dict_data values (41, 0, '正高', '0', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (42, 1, '副高', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (43, 2, '中级', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (44, 3, '助工', '3', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (45, 4, '注册测绘师', '4', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:30', '', null, null);
+insert into sys_dict_data values (46, 5, '注册城乡规划师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:11', '', null, null);
+insert into sys_dict_data values (47, 6, '注册岩土工程师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:58', '', null, null);
+insert into sys_dict_data values (48, 7, '注册安全工程师', '7', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:13', '', null, null);
+insert into sys_dict_data values (49, 8, '注册会计师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:36', '', null, null);
+insert into sys_dict_data values (50, 0, '不合格', '0', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:47', '', null, null);
+insert into sys_dict_data values (51, 1, '合格', '1', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:56', '', null, null);
+insert into sys_dict_data values (52, 2, '良好', '2', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:08', '', null, null);
+insert into sys_dict_data values (53, 3, '优秀', '3', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:23', '', null, null);
+insert into sys_dict_data values (54, 0, '生疏', '0', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:12', '', null, null);
+insert into sys_dict_data values (55, 1, '较熟练', '1', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:20', '', null, null);
+insert into sys_dict_data values (56, 2, '熟练', '2', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:28', '', null, null);
+insert into sys_dict_data values (57, 3, '精通', '3', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:06', '', null, null);
+insert into sys_dict_data values (58, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
+insert into sys_dict_data values (59, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
+insert into sys_dict_data values (60, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
+insert into sys_dict_data values (61, 0, '主办', '00', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
+insert into sys_dict_data values (62, 1, '参与', '01', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
+insert into sys_dict_data values (63, 2, '协办', '02', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
+insert into sys_dict_data values (64, 3, '常规项目', '03', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
+insert into sys_dict_data values (65, 4, '监测项目', '04', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
+insert into sys_dict_data values (66, 5, '调查项目', '05', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
+insert into sys_dict_data values (67, 6, '测量项目', '06', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
+insert into sys_dict_data values (68, 7, '其他项目', '07', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
+insert into sys_dict_data values (69, 8, '选点', '08', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
+insert into sys_dict_data values (70, 9, '埋石', '09', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
+insert into sys_dict_data values (71, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, null);
+insert into sys_dict_data values (72, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, null);
+insert into sys_dict_data values (73, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, null);
+insert into sys_dict_data values (74, 13, '负责', '13', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:41', '', null, null);
+insert into sys_dict_data values (75, 14, '前视', '14', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:05', '', null, null);
+insert into sys_dict_data values (76, 15, '后视', '15', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:14', '', null, null);
+insert into sys_dict_data values (77, 16, '水准', '16', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:38', '', null, null);
+insert into sys_dict_data values (78, 17, '三角高程', '17', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:52', '', null, null);
+insert into sys_dict_data values (79, 18, '实测', '18', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:09', '', null, null);
+insert into sys_dict_data values (80, 19, '相控', '19', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:29', '', null, null);
+insert into sys_dict_data values (81, 20, '调绘', '20', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:31:53', '', null, null);
+insert into sys_dict_data values (82, 21, '测量', '21', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:32:57', '', null, null);
+insert into sys_dict_data values (83, 22, '整理', '22', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:33:08', '', null, null);
+insert into sys_dict_data values (84, 23, '主飞', '23', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:22', '', null, null);
+insert into sys_dict_data values (85, 24, '协飞', '24', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:48', '', null, null);
+insert into sys_dict_data values (86, 25, '作业', '25', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:43:01', '', null, null);
+insert into sys_dict_data values (87, 26, '检查', '26', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:44:59', '', null, null);
+insert into sys_dict_data values (88, 27, '负责', '27', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:45:12', '', null, null);
+insert into sys_dict_data values (89, 28, '空三', '28', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:14', '', null, null);
+insert into sys_dict_data values (90, 29, '建模', '29', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:42', '', null, null);
+insert into sys_dict_data values (91, 30, '修模', '30', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:55', '', null, null);
+insert into sys_dict_data values (92, 0, '傲视', '0', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:35', '', null, null);
+insert into sys_dict_data values (93, 1, '飞马', '1', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:46', '', null, null);
+insert into sys_dict_data values (94, 2, '华测', '2', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:56', '', null, null);
+insert into sys_dict_data values (95, 3, '其他', '3', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:36:03', '', null, null);
 insert into sys_dict_data values (102, 0, '用车审批流程', 'car', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 10:56:19', '', null, null);
 insert into sys_dict_data values (103, 0, '仪器审批流程', 'device', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 10:58:43', '', null, null);
 insert into sys_dict_data values (104, 0, '项目流转流程', 'project', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 10:59:48', '', null, null);
@@ -1328,13 +1331,13 @@ create table cmc_assess_content_work (
 -- ----------------------------
 -- 23、cmc项目表
 -- ----------------------------
-drop table if exists `cmc_project`;
-create table `cmc_project`  (
-  `project_id` char(19)				not null			comment '项目id',
-  `project_number` varchar(10)		default null		comment '项目编号',
-  `project_name` varchar(255)		default null		comment '项目名称',
-  primary key (`project_id`) using btree
-) engine = innodb comment = 'cmc项目表';;
+drop table if exists cmc_project;
+create table cmc_project  (
+  project_id		char(19)				not null			comment '项目id',
+  project_number	varchar(10)				default null		comment '项目编号',
+  project_name		varchar(255)			default null		comment '项目名称',
+  primary key (project_id)
+) engine = innodb comment = 'cmc项目表';
 
 -- ----------------------------
 -- 初始化-项目表数据

oa-ui/src/api/oa/assess/assess.js

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-24 17:16:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-24 17:31:59
+ * @LastEditTime: 2024-02-01 09:12:06
  */
 import request from '@/utils/request'
 
@@ -41,7 +41,7 @@ export function submitAssess(data) {
   })
 }
 
-// 修改cmc考核
+// 更新cmc考核
 export function updateAssess(data) {
   return request({
     url: '/oa/assess',
@@ -50,6 +50,15 @@ export function updateAssess(data) {
   })
 }
 
+// 修改cmc考核
+export function modifyAssess(data) {
+  return request({
+    url: '/oa/assess/modify',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除cmc考核
 export function delAssess(assessId) {
   return request({

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -89,16 +89,16 @@
       </el-tabs>
       <!--审批任务-->
       <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
-        <!-- <el-form ref="taskForm" :model="taskForm">
+        <el-form ref="taskForm" :model="taskForm">
           <el-form-item prop="targetKey">
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
           </el-form-item>
-          <el-form-item label="处理意见" label-width="80px" prop="comment"
+          <!-- <el-form-item label="处理意见" label-width="80px" prop="comment"
             :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
             <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
-          </el-form-item>
-        </el-form> -->
+          </el-form-item> -->
+        </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="completeOpen = false">取 消</el-button>
           <el-button type="primary" @click="taskComplete">确 定</el-button>
@@ -154,7 +154,7 @@ import {
   flowTaskForm,
   checkIsStartUserNode
 } from "@/api/flowable/todo";
-import { getAssess } from '@/api/oa/assess/assess'
+import { getAssess, modifyAssess } from '@/api/oa/assess/assess'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listUser } from "@/api/system/user";
@@ -360,73 +360,43 @@ export default {
     },
     /** 加载审批任务弹框 */
     handleComplete() {
-      this.completeOpen = true;
-      this.completeTitle = "流程审批";
+      // this.completeOpen = true;
+      // this.completeTitle = "流程审批";
       // this.submitForm(null);
+      let formData = new FormData();
+      let form = JSON.stringify(this.tableForm);
+      formData.append("form", form);
+      this.submitForm(formData);
     },
     /** 用户审批任务 */
     taskComplete() {
-      debugger
-      if(this.taskForm.variables === null){
-        this.taskForm.variables= {};
+      if (!this.taskForm.variables && this.checkSendUser) {
+        this.$modal.msgError("请选择流程接收人员!");
+        return;
+      }
+      if (!this.taskForm.variables && this.checkSendRole) {
+        this.$modal.msgError("请选择流程接收角色组!");
+        return;
+      }
+      this.$delete(this.taskForm.variables, "pass");
+      if (this.taskForm && this.formKeyExist) {
+        // 表单是否禁用
+        this.taskForm.formData.formData.disabled = true;
+        // 是否显示按钮
+        this.taskForm.formData.formData.formBtns = false;
+        this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
+        this.taskForm.variables.variables = this.taskForm.formData.formData;
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      } else {
+        // 流程设计人员类型配置为固定人员接收任务时,直接提交任务到下一步
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
       }
-      getNextFlowNode({taskId: this.taskForm.taskId}).then(res => {
-        const data = res.data;
-        debugger
-        // this.taskForm.formData = formData;
-        if (data) {
-          if (data.dataType === 'dynamic') {
-            if (data.type === 'assignee') { // 指定人员
-              this.checkSendUser = true;
-              this.checkType = "single";
-            } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
-              this.checkSendUser = true;
-              this.checkType = "multiple";
-            } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
-              this.checkSendRole = true;
-            } else { // 会签
-              // 流程设计指定的 elementVariable 作为会签人员列表
-              this.multiInstanceVars = data.vars;
-              this.checkSendUser = true;
-              this.checkType = "multiple";
-            }
-          }
-        }
-        this.completeOpen = true;
-        this.completeTitle = "流程审批";
-      })
-
-      // this.$set(this.taskForm.variables, "pass", "通过");
-      // if (!this.taskForm.variables && this.checkSendUser) {
-      //   this.$modal.msgError("请选择流程接收人员!");
-      //   return;
-      // }
-      // if (!this.taskForm.variables && this.checkSendRole) {
-      //   this.$modal.msgError("请选择流程接收角色组!");
-      //   return;
-      // }
-      // if (!this.taskForm.comment) {
-      //   this.$modal.msgError("请输入审批意见!");
-      //   return;
-      // }
-      // if (this.taskForm && this.formKeyExist) {
-      //   // 表单是否禁用
-      //   this.taskForm.formData.formData.disabled = true;
-      //   // 是否显示按钮
-      //   this.taskForm.formData.formData.formBtns = false;
-      //   this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
-      //   this.taskForm.variables.variables = this.taskForm.formData.formData;
-      //   complete(this.taskForm).then(response => {
-      //     this.$modal.msgSuccess(response.msg);
-      //     this.goBack();
-      //   });
-      // } else {
-      //   // 流程设计人员类型配置为固定人员接收任务时,直接提交任务到下一步
-      //   complete(this.taskForm).then(response => {
-      //     this.$modal.msgSuccess(response.msg);
-      //     this.goBack();
-      //   });
-      // }
     },
     /** 委派任务 */
     handleDelegate() {
@@ -508,7 +478,16 @@ export default {
     },
     /** 申请流程表单数据提交 */
     submitForm(formData) {
-      // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
+      modifyAssess(formData).then(res => {
+      });
+      if(this.taskForm.variables === null){
+        this.taskForm.variables= {};
+      }
+      //排他网关，表达式，多节点情况下，审核通过，先将流程表达式pass变量存入，便于查找流程下一节点
+      this.$set(this.taskForm.variables, "pass", "通过");
+      complete(this.taskForm).then(response => {
+      });
+      // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况（todo已在上一步实现）
       const params = { taskId: this.taskForm.taskId }
       getNextFlowNode(params).then(res => {
         const data = res.data;