判断登录人是否当前节点人

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

@@ -11,6 +11,7 @@ import com.ruoyi.oa.domain.CmcAssessContent;
 import com.ruoyi.oa.domain.CmcAssessContentWork;
 import com.ruoyi.oa.service.ICmcAssessContentService;
 import com.ruoyi.oa.service.ICmcAssessContentWorkService;
+import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,8 @@ public class CmcAssessController extends BaseController
     private ISysUserService userService;
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private ICmcProjectService cmcProjectService;
 
     /**
      * 查询考核表列表
@@ -82,7 +85,8 @@ public class CmcAssessController extends BaseController
         formData.put("nickName", userService.selectUserById(userId).getNickName());
         formData.put("assessId", cmcAssess.getAssessId());
         formData.put("assessTime", cmcAssess.getAssessTime());
-        formData.put("projectName", cmcAssess.getProjectId());
+        formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
+        formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
         formData.put("pmlevel", userService.selectUserById(userId).getPmLevel());
@@ -140,7 +144,7 @@ public class CmcAssessController extends BaseController
         cmcAssessService.insertCmcAssess(cmcAssess);
         for (String key : formDataJson.keySet()) {
             if (key.equals("projectId"))
-                cmcAssess.setProjectId(formDataJson.getLong(key));
+                cmcAssess.setProjectId(formDataJson.getString(key));
             if (key.equals("assessTime"))
                 cmcAssess.setAssessTime(formDataJson.getDate(key));
             if (key.equals("otherWork"))
@@ -202,7 +206,7 @@ public class CmcAssessController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formDataJson.getString("assessId"));
-        cmcAssess.setProjectId(formDataJson.getLong("projectId"));
+        cmcAssess.setProjectId(formDataJson.getString("projectId"));
         cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
         cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
         cmcAssess.setSelfAssess(formDataJson.getString("selfAssess"));

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -184,6 +184,12 @@ public class FlowTaskController {
         return flowTaskService.checkIsStartUserNode(flowTaskVo);
     }
 
+    @ApiOperation(value = "判断登录人是否当前节点人")
+    @PostMapping(value = "/isCurrentNodeAssignee")
+    public AjaxResult getCurrentNodeAssignee(@RequestBody FlowTaskVo flowTaskVo) {
+        return flowTaskService.getCurrentNodeAssignee(flowTaskVo);
+    }
+
     /**
      * 生成流程图
      *

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

@@ -193,6 +193,13 @@ public interface IFlowTaskService {
      */
     AjaxResult checkIsStartUserNode(FlowTaskVo flowTaskVo);
 
+    /**
+     * 判断登录人是否当前节点人
+     * @param flowTaskVo 任务
+     * @return
+     */
+    AjaxResult getCurrentNodeAssignee(FlowTaskVo flowTaskVo);
+
     /**
      * 流程初始化表单
      * @param deployId

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

@@ -39,7 +39,7 @@ import org.flowable.bpmn.model.*;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableObjectNotFoundException;
 import org.flowable.common.engine.impl.identity.Authentication;
-import org.flowable.engine.ProcessEngineConfiguration;
+import org.flowable.engine.*;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
@@ -1138,6 +1138,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return AjaxResult.success(isStartNode);
     }
 
+    /**
+     * 判断登录人是否当前节点人
+     *
+     * @param flowTaskVo 任务
+     * @return
+     */
+    public AjaxResult getCurrentNodeAssignee(FlowTaskVo flowTaskVo) {
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        TaskService taskService = processEngine.getTaskService();
+        String assignee = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult().getAssignee();
+        return AjaxResult.success(Objects.equals(assignee, SecurityUtils.getLoginUser().getUser().getUserId().toString()));
+    }
+
     /**
      * 流程初始化表单
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java

@@ -26,7 +26,7 @@ public class CmcAssess extends BaseEntity
 
     /** 项目id */
     @Excel(name = "项目id")
-    private Long projectId;
+    private String projectId;
 
     /** 考核时间（月份） */
     @Excel(name = "考核时间", readConverterExp = "月份")
@@ -97,12 +97,12 @@ public class CmcAssess extends BaseEntity
     {
         return userId;
     }
-    public void setProjectId(Long projectId)
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public Long getProjectId()
+    public String getProjectId()
     {
         return projectId;
     }

oa-back/sql/ry_20231130.sql

@@ -78,7 +78,7 @@ create table sys_user (
 -- ----------------------------
 -- 初始化-用户信息表数据
 -- ----------------------------
-insert into sys_user values (1, 103, 'admin', 'admin', '00', '', 'admin', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-01-08 10:07:29', null, '2024-01-04 17:22:48', null, '2024-01-08 10:07:29', '管理员', null, null, null, null, null);
+insert into sys_user values (1, 103, 'admin', 'admin', '00', '', 'admin', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, '管理员', null, null, null, null, null);
 insert into sys_user values (2, 101, '13982275233', '刘光庆', '00', '', '13982275233', '0', '', '$2a$10$pcdc8BbNDNiWaQUU14BC3eGWxB4sSJOQZBL9QFftkhkjcbYU03DNi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (3, 101, '13808211356', '向发廷', '00', '', '13808211356', '0', '', '$2a$10$zynAhjpaUxERmH4yo9R9s.O.oUgpxwRKtKA6X74ncn0z1ajFxqMyq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (4, 101, '13608089391', '王 渊', '00', '', '13608089391', '0', '', '$2a$10$sKWfjdS0vJMA194/pu9q/e8Etz6kNBTzlURGDtKreBE8oHsRWP9hW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
@@ -179,54 +179,55 @@ insert into sys_user values (98, 111, '13618069959', '蒋剑虹', '00', '', '136
 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);
-insert into sys_user values (108, 112, '15883351306', '彭永红', '00', '', '15883351306', '0', '', '$2a$10$Tlq6UDINB73aeR8MCW6emOO7MHLRUGkTZ0ud/oNvTrJllwwDpxhGe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (109, 112, '18281010079', '邓   静', '00', '', '18281010079', '0', '', '$2a$10$pstdOImPwTHv54sONZEyBObA1RySMTJx2rx5btFUq6WF3qkkeP2Y6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (110, 112, '18328739381', '刘庆波', '00', '', '18328739381', '0', '', '$2a$10$p72rrc68EO/XkCYDVVTNDurHcg4z64VgyedcadnOiX7RWV2GU7pv.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (111, 112, '18205207306', '高   强', '00', '', '18205207306', '0', '', '$2a$10$p9WM4wlg34eq7yb9GAe.a.yvZhqsUBVQ.DIFIrBWZ5ufrUsu5oIKm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (112, 112, '18380411075', '韩兴国', '00', '', '18380411075', '0', '', '$2a$10$0RNiRPmnuFMvCbRsSAQ4COgX0GRbi304ZpcNuV/gzAoZFYwv1fNYS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (113, 112, '13693480782', '何   安', '00', '', '13693480782', '0', '', '$2a$10$vPcVlPiTH2nOO48/JTeXt.FpFoc9V407XxcCUmbt23Fe3pL5AvqYK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (114, 113, '18628072166', '李春生', '00', '', '18628072166', '0', '', '$2a$10$Nojkqmf0J0e2ZG/7H/RNAOLQvtoCgOB.zqf52oCXnbW7XlN6VzaOe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (115, 113, '13980688458', '段文祥', '00', '', '13980688458', '0', '', '$2a$10$4ETMsgQR7HcIjqmE3SXATOxud3L/tpPiYqt0GGRHsIB55WM4rR9Ry', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (116, 113, '18980006770', '张   伟', '00', '', '18980006770', '0', '', '$2a$10$dtTx73vRXEnbuwbyt.Hm4uhDLRI07BOwgRMMx1/tZBBy9CFTb8Mw6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (117, 113, '15298033499', '万   明', '00', '', '15298033499', '0', '', '$2a$10$D9KhWl1cXJd7X8ejB8cZmODrpw.7CY0QROlXYc20zy/tyhGAbFZcW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (118, 113, '18345595350', '王雨地', '00', '', '18345595350', '0', '', '$2a$10$pwU00C244h.JM52gYAwXDemz8GD6G8QQL81ZIHHswR6owx3JJQzf2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (119, 113, '13881710080', '陈   兰', '00', '', '13881710080', '1', '', '$2a$10$sXVsn5kxi5rNd5mYJW.MrOKfY1YY/eFYYUNAm6f8A9Ak9JbF2Js0y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (120, 113, '18582552495', '张   可', '00', '', '18582552495', '0', '', '$2a$10$..LijGqYettSPi41oAdLnehfukhiYKPpI9t1EKaYhrTyuW/y.v.By', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (121, 114, '13551823637', '李   锋', '00', '', '13551823637', '0', '', '$2a$10$/T1kLMSSFMAmoy4QhkTzFO1vVm8/csHuuaeAKsjeEx/w1d3SsA2pi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (122, 114, '13881397406', '张元锋', '00', '', '13881397406', '0', '', '$2a$10$3L/5ASJal42wccw7BhyIaOcedcj6IOadjnUGymzWH/kbYYQmA/K3y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (123, 114, '18602865330', '钱俊锦', '00', '', '18602865330', '0', '', '$2a$10$YuF2Yk6rCdCIu0c5Q6Uw4eBdh3vcTmbCpmETgd.FI.RVUVL.uTLEq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (124, 114, '17311677347', '陈   伟', '00', '', '17311677347', '0', '', '$2a$10$fbrbmyWNFA7aiCbOtCqaDONw7qDgdS4UZDS95BUOHJ88eUzVtr3/S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (125, 114, '13628057328', '薛   帅', '00', '', '13628057328', '0', '', '$2a$10$ND.pJthbdY1tY8LHYtJkpeADmaTDJNvwPClaERSAyKIcLd4xT5uyq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (126, 114, '18482173451', '冉凉南', '00', '', '18482173451', '0', '', '$2a$10$IyIeQtlKtZTNpidzX4R.7OOWt21XkMBiHZn92F/f8oT94QfMUKoA6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (127, 114, '18382319155', '谢承东', '00', '', '18382319155', '0', '', '$2a$10$AkWugwBKCG7oKIKPIn9mBOaFtuCtTw3cJvz78ryEMUTTjfG/fDYgy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (128, 114, '18227480379', '周   炎', '00', '', '18227480379', '0', '', '$2a$10$5e7lOXqGekSSu.rKKMQJYuLJc68RZllH2ebGFEr/He6cc2zsQJPzm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (129, 114, '18140430240', '胡   庆', '00', '', '18140430240', '0', '', '$2a$10$IckBbWNu8BS6JkdITuvMzu7G/Ztl.d.gbp1xwQqpgYDUEYEaxFUkS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (130, 114, '18780029464', '何   行', '00', '', '18780029464', '0', '', '$2a$10$0BpGvlJOqHQyM//wJh3lAO/7e/s.dys5iVCGu0K/qcjsLpgveK4ou', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (131, 103, '18283500919', '杨良轩', '00', '', '18283500919', '0', '', '$2a$10$vUYbhAPQRZuj8S5cjvC5XODjTswaxbWr049ICezchhb4ueoNQ4S6i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (132, 103, '13880159142', '周建伟', '00', '', '13880159142', '0', '', '$2a$10$vY871WQd/F9BGNg1Ki2.VOYsT704ttmif5b3U1Aaj392CydaVTTfm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (133, 103, '13980809722', '罗友权', '00', '', '13980809722', '0', '', '$2a$10$/cL8xD1pFmFxLyehpr2x1e3n/8KqKG6lWaXdjyHyaZo37oCP4wfem', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (134, 103, '15228916534', '凌   涛', '00', '', '15228916534', '0', '', '$2a$10$BdjU17zPn5JZpcyOBBK3X.GiQOdZfuRVmiljOJMde4/EJM67Zp7/C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (135, 103, '15928517280', '雷光泽', '00', '', '15928517280', '0', '', '$2a$10$soo68IbKDhCT0mhj.j0Nou2rsgVxLU78BsowMo7ZorasQj9FPf2OG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (136, 103, '15828156243', '廖   勇', '00', '', '15828156243', '0', '', '$2a$10$9QO6qXNSAiAtWFCXbvEeu.pHoBLHZig5ra.y2ZNRyRDxL0W4WU2Q2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (137, 103, '14726050305', '康科伟', '00', '', '14726050305', '0', '', '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (138, 103, '18111675896', '熊艳华', '00', '', '18111675896', '0', '', '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (139, 103, '18982085285', '赵永来', '00', '', '18982085285', '0', '', '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (140, 115, '15982167611', '刘   洋', '00', '', '15982167611', '0', '', '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (141, 115, '17345090038', '郑   鹏', '00', '', '17345090038', '0', '', '$2a$10$meTOhyDbWqzhrzCFDGM3hu.cOFwinewDE1Jp3YYR/ThYBvOssce7G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (142, 115, '17612894797', '黄   强', '00', '', '17612894797', '0', '', '$2a$10$JyofvRfiRj5Ug2G4ux00eOtMvQSOKu.tjo0.Juey2xMZSsAggVE76', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (143, 116, '13980977233', '李   禺', '00', '', '13980977233', '0', '', '$2a$10$AiciBrz84EwU3G3KxW9bCOZXgxraa74RRzAvyetSEjC30Zvq2ooH2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (144, 116, '18602830814', '黄梅琳', '00', '', '18602830814', '1', '', '$2a$10$Ij6SqoLMDrpLBJ87rKqIh.8JDRNMROQQyHQSZV5wsUn7ybJ53ip86', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (145, 116, '13488982667', '尹   超', '00', '', '13488982667', '0', '', '$2a$10$F.REC7OQ2uNCFeUOpopqaeSsDn9MR/a01G4TTG.uaCgq2OukjBXrO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (146, 116, '15881108097', '程   昊', '00', '', '15881108097', '0', '', '$2a$10$y1Z2H5Wp4yhdnmHcNO7U6u9108qE/uxqQ7OVumAtVLlgDbj/ZWo/.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (147, 116, '15928663470', '丁   亮', '00', '', '15928663470', '0', '', '$2a$10$WYBOgIm.Y.LNSEKs3VPaX.1JpD.VLodHuug5wOeX636vln31SHII2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (148, 117, '13880644169', '林方迁', '00', '', '13880644169', '0', '', '$2a$10$VPrToUrklp3J3NtnHAy7VulN9Eck4eTuII4xmXh.JKOue9BN91Tq.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
-insert into sys_user values (149, 117, '18140055216', '杨   柳', '00', '', '18140055216', '1', '', '$2a$10$K1WECO/2G5tAKCr3h16CzeypD2CSVjq1MWdk1FLjhnAKD2SwanrT6', '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, '19949408104', '罗   毅', '00', '', '19949408104', '0', '', '$2a$10$2QEEZ1VZ0Me6Ndaoon78Z.V7mBAyLIZKf7EokR/zILsd837A7ITgq', '0', '0', '', null, null, '2024-01-04 17:22:48', '', 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 (105, 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 (106, 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 (107, 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 (108, 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);
+insert into sys_user values (109, 112, '15883351306', '彭永红', '00', '', '15883351306', '0', '', '$2a$10$Tlq6UDINB73aeR8MCW6emOO7MHLRUGkTZ0ud/oNvTrJllwwDpxhGe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (110, 112, '18281010079', '邓   静', '00', '', '18281010079', '0', '', '$2a$10$pstdOImPwTHv54sONZEyBObA1RySMTJx2rx5btFUq6WF3qkkeP2Y6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (111, 112, '18328739381', '刘庆波', '00', '', '18328739381', '0', '', '$2a$10$p72rrc68EO/XkCYDVVTNDurHcg4z64VgyedcadnOiX7RWV2GU7pv.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (112, 112, '18205207306', '高   强', '00', '', '18205207306', '0', '', '$2a$10$p9WM4wlg34eq7yb9GAe.a.yvZhqsUBVQ.DIFIrBWZ5ufrUsu5oIKm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (113, 112, '18380411075', '韩兴国', '00', '', '18380411075', '0', '', '$2a$10$0RNiRPmnuFMvCbRsSAQ4COgX0GRbi304ZpcNuV/gzAoZFYwv1fNYS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (114, 112, '13693480782', '何   安', '00', '', '13693480782', '0', '', '$2a$10$vPcVlPiTH2nOO48/JTeXt.FpFoc9V407XxcCUmbt23Fe3pL5AvqYK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (115, 113, '18628072166', '李春生', '00', '', '18628072166', '0', '', '$2a$10$Nojkqmf0J0e2ZG/7H/RNAOLQvtoCgOB.zqf52oCXnbW7XlN6VzaOe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (116, 113, '13980688458', '段文祥', '00', '', '13980688458', '0', '', '$2a$10$4ETMsgQR7HcIjqmE3SXATOxud3L/tpPiYqt0GGRHsIB55WM4rR9Ry', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (117, 113, '18980006770', '张   伟', '00', '', '18980006770', '0', '', '$2a$10$dtTx73vRXEnbuwbyt.Hm4uhDLRI07BOwgRMMx1/tZBBy9CFTb8Mw6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (118, 113, '15298033499', '万   明', '00', '', '15298033499', '0', '', '$2a$10$D9KhWl1cXJd7X8ejB8cZmODrpw.7CY0QROlXYc20zy/tyhGAbFZcW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (119, 113, '18345595350', '王雨地', '00', '', '18345595350', '0', '', '$2a$10$pwU00C244h.JM52gYAwXDemz8GD6G8QQL81ZIHHswR6owx3JJQzf2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (120, 113, '13881710080', '陈   兰', '00', '', '13881710080', '1', '', '$2a$10$sXVsn5kxi5rNd5mYJW.MrOKfY1YY/eFYYUNAm6f8A9Ak9JbF2Js0y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (121, 113, '18582552495', '张   可', '00', '', '18582552495', '0', '', '$2a$10$..LijGqYettSPi41oAdLnehfukhiYKPpI9t1EKaYhrTyuW/y.v.By', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (122, 114, '13551823637', '李   锋', '00', '', '13551823637', '0', '', '$2a$10$/T1kLMSSFMAmoy4QhkTzFO1vVm8/csHuuaeAKsjeEx/w1d3SsA2pi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (123, 114, '13881397406', '张元锋', '00', '', '13881397406', '0', '', '$2a$10$3L/5ASJal42wccw7BhyIaOcedcj6IOadjnUGymzWH/kbYYQmA/K3y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (124, 114, '18602865330', '钱俊锦', '00', '', '18602865330', '0', '', '$2a$10$YuF2Yk6rCdCIu0c5Q6Uw4eBdh3vcTmbCpmETgd.FI.RVUVL.uTLEq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (125, 114, '17311677347', '陈   伟', '00', '', '17311677347', '0', '', '$2a$10$fbrbmyWNFA7aiCbOtCqaDONw7qDgdS4UZDS95BUOHJ88eUzVtr3/S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (126, 114, '13628057328', '薛   帅', '00', '', '13628057328', '0', '', '$2a$10$ND.pJthbdY1tY8LHYtJkpeADmaTDJNvwPClaERSAyKIcLd4xT5uyq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (127, 114, '18482173451', '冉凉南', '00', '', '18482173451', '0', '', '$2a$10$IyIeQtlKtZTNpidzX4R.7OOWt21XkMBiHZn92F/f8oT94QfMUKoA6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (128, 114, '18382319155', '谢承东', '00', '', '18382319155', '0', '', '$2a$10$AkWugwBKCG7oKIKPIn9mBOaFtuCtTw3cJvz78ryEMUTTjfG/fDYgy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (129, 114, '18227480379', '周   炎', '00', '', '18227480379', '0', '', '$2a$10$5e7lOXqGekSSu.rKKMQJYuLJc68RZllH2ebGFEr/He6cc2zsQJPzm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (130, 114, '18140430240', '胡   庆', '00', '', '18140430240', '0', '', '$2a$10$IckBbWNu8BS6JkdITuvMzu7G/Ztl.d.gbp1xwQqpgYDUEYEaxFUkS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (131, 114, '18780029464', '何   行', '00', '', '18780029464', '0', '', '$2a$10$0BpGvlJOqHQyM//wJh3lAO/7e/s.dys5iVCGu0K/qcjsLpgveK4ou', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (132, 103, '18283500919', '杨良轩', '00', '', '18283500919', '0', '', '$2a$10$vUYbhAPQRZuj8S5cjvC5XODjTswaxbWr049ICezchhb4ueoNQ4S6i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (133, 103, '13880159142', '周建伟', '00', '', '13880159142', '0', '', '$2a$10$vY871WQd/F9BGNg1Ki2.VOYsT704ttmif5b3U1Aaj392CydaVTTfm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (134, 103, '13980809722', '罗友权', '00', '', '13980809722', '0', '', '$2a$10$/cL8xD1pFmFxLyehpr2x1e3n/8KqKG6lWaXdjyHyaZo37oCP4wfem', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (135, 103, '15228916534', '凌   涛', '00', '', '15228916534', '0', '', '$2a$10$BdjU17zPn5JZpcyOBBK3X.GiQOdZfuRVmiljOJMde4/EJM67Zp7/C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (136, 103, '15928517280', '雷光泽', '00', '', '15928517280', '0', '', '$2a$10$soo68IbKDhCT0mhj.j0Nou2rsgVxLU78BsowMo7ZorasQj9FPf2OG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (137, 103, '15828156243', '廖   勇', '00', '', '15828156243', '0', '', '$2a$10$9QO6qXNSAiAtWFCXbvEeu.pHoBLHZig5ra.y2ZNRyRDxL0W4WU2Q2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (138, 103, '14726050305', '康科伟', '00', '', '14726050305', '0', '', '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (139, 103, '18111675896', '熊艳华', '00', '', '18111675896', '0', '', '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (140, 103, '18982085285', '赵永来', '00', '', '18982085285', '0', '', '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (141, 115, '15982167611', '刘   洋', '00', '', '15982167611', '0', '', '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (142, 115, '17345090038', '郑   鹏', '00', '', '17345090038', '0', '', '$2a$10$meTOhyDbWqzhrzCFDGM3hu.cOFwinewDE1Jp3YYR/ThYBvOssce7G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (143, 115, '17612894797', '黄   强', '00', '', '17612894797', '0', '', '$2a$10$JyofvRfiRj5Ug2G4ux00eOtMvQSOKu.tjo0.Juey2xMZSsAggVE76', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (144, 116, '13980977233', '李   禺', '00', '', '13980977233', '0', '', '$2a$10$AiciBrz84EwU3G3KxW9bCOZXgxraa74RRzAvyetSEjC30Zvq2ooH2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (145, 116, '18602830814', '黄梅琳', '00', '', '18602830814', '1', '', '$2a$10$Ij6SqoLMDrpLBJ87rKqIh.8JDRNMROQQyHQSZV5wsUn7ybJ53ip86', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (146, 116, '13488982667', '尹   超', '00', '', '13488982667', '0', '', '$2a$10$F.REC7OQ2uNCFeUOpopqaeSsDn9MR/a01G4TTG.uaCgq2OukjBXrO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (147, 116, '15881108097', '程   昊', '00', '', '15881108097', '0', '', '$2a$10$y1Z2H5Wp4yhdnmHcNO7U6u9108qE/uxqQ7OVumAtVLlgDbj/ZWo/.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (148, 116, '15928663470', '丁   亮', '00', '', '15928663470', '0', '', '$2a$10$WYBOgIm.Y.LNSEKs3VPaX.1JpD.VLodHuug5wOeX636vln31SHII2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (149, 117, '13880644169', '林方迁', '00', '', '13880644169', '0', '', '$2a$10$VPrToUrklp3J3NtnHAy7VulN9Eck4eTuII4xmXh.JKOue9BN91Tq.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
+insert into sys_user values (150, 117, '18140055216', '杨   柳', '00', '', '18140055216', '1', '', '$2a$10$K1WECO/2G5tAKCr3h16CzeypD2CSVjq1MWdk1FLjhnAKD2SwanrT6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 
 
 -- ----------------------------
@@ -604,6 +605,7 @@ insert into sys_user_role values (146, 2);
 insert into sys_user_role values (147, 2);
 insert into sys_user_role values (148, 2);
 insert into sys_user_role values (149, 2);
+insert into sys_user_role values (150, 2);
 
 
 -- ----------------------------
@@ -860,9 +862,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, 12);
-insert into sys_user_post values (103, 13);
-insert into sys_user_post values (104, 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 (105, 26);
 insert into sys_user_post values (106, 26);
 insert into sys_user_post values (107, 26);
@@ -872,24 +874,24 @@ insert into sys_user_post values (110, 26);
 insert into sys_user_post values (111, 26);
 insert into sys_user_post values (112, 26);
 insert into sys_user_post values (113, 26);
-insert into sys_user_post values (114, 15);
-insert into sys_user_post values (115, 26);
+insert into sys_user_post values (114, 26);
+insert into sys_user_post values (115, 15);
 insert into sys_user_post values (116, 26);
 insert into sys_user_post values (117, 26);
 insert into sys_user_post values (118, 26);
 insert into sys_user_post values (119, 26);
 insert into sys_user_post values (120, 26);
-insert into sys_user_post values (121, 17);
+insert into sys_user_post values (121, 26);
 insert into sys_user_post values (122, 17);
-insert into sys_user_post values (123, 18);
-insert into sys_user_post values (124, 26);
+insert into sys_user_post values (123, 17);
+insert into sys_user_post values (124, 18);
 insert into sys_user_post values (125, 26);
 insert into sys_user_post values (126, 26);
 insert into sys_user_post values (127, 26);
 insert into sys_user_post values (128, 26);
 insert into sys_user_post values (129, 26);
 insert into sys_user_post values (130, 26);
-insert into sys_user_post values (131, 27);
+insert into sys_user_post values (131, 26);
 insert into sys_user_post values (132, 27);
 insert into sys_user_post values (133, 27);
 insert into sys_user_post values (134, 27);
@@ -898,16 +900,17 @@ 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, 15);
-insert into sys_user_post values (141, 26);
+insert into sys_user_post values (140, 27);
+insert into sys_user_post values (141, 15);
 insert into sys_user_post values (142, 26);
-insert into sys_user_post values (143, 1);
-insert into sys_user_post values (144, 2);
-insert into sys_user_post values (145, 26);
+insert into sys_user_post values (143, 26);
+insert into sys_user_post values (144, 1);
+insert into sys_user_post values (145, 2);
 insert into sys_user_post values (146, 26);
 insert into sys_user_post values (147, 26);
 insert into sys_user_post values (148, 26);
 insert into sys_user_post values (149, 26);
+insert into sys_user_post values (150, 26);
 
 
 -- ----------------------------
@@ -1282,7 +1285,7 @@ drop table if exists cmc_assess;
 create table cmc_assess (
   assess_id				char(19)		not null		comment '总考核表id',
   user_id				bigint			default null	comment '用户id',
-  project_id			bigint			default null	comment '项目id',
+  project_id			char(19)		default null	comment '项目id',
   assess_time			datetime		default null	comment '考核时间（月份）',
   dept_assessment		char(1)			default null	comment '部门考核等级（不合格、合格、良好、优秀）',
   dept_advice			varchar(255)	default null	comment '部门考核意见',

oa-ui/src/api/flowable/todo.js

@@ -82,6 +82,15 @@ export function checkIsStartUserNode(data) {
   })
 }
 
+// 判断登录人是否当前节点人
+export function getCurrentNodeAssignee(data) {
+  return request({
+    url: '/flowable/task/isCurrentNodeAssignee',
+    method: 'post',
+    data: data
+  })
+}
+
 // 部署流程实例
 export function deployStart(deployId) {
   return request({