优化

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -568,13 +568,13 @@ public class FlowableRest implements FlowableFeign {
             dto.setComment("因与下一级审批人相同，系统自动处理，需以下一级审批人审批意见为准！");
             return handleProsess(dto, false);
         }
-        if (adminSecondsContains) {
+      /*  if (adminSecondsContains) {
             dto.setUserSid(nextUserSid);
             dto.setTaskId(vo.getTaskId());
             dto.setTaskDefKey(taskDefKey);
             dto.setComment("系统自动跳过");
             return handleProsess(dto, false);
-        }
+        }*/
 
         vo.setProcInsId(instanceId);
         vo.setProcDefId(task.getProcessDefinitionId());

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -1343,15 +1343,17 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     listResultBean_2= taskReject_(flowTaskVo, true);
                 }else{
                     if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(assignee_)){
+                        flowTaskVo.setUserId(flowTaskVo.getUserSid());
                         flowTaskVo.setTaskId(id_);
                         flowTaskVo.setUserSid(assignee_);
                         flowTaskVo.setTargetKey(item.getId());
                         listResultBean_2= taskReject_(flowTaskVo, true);
                     }else{
-                        if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(flowTaskVo.getUserSid())){
+                        if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(flowTaskVo.getUserSid()) && assignee_.equals(flowTaskVo.getUserId())){
                             flowTaskVo.setTaskId(id_);
                             flowTaskVo.setUserSid(assignee_);
                             flowTaskVo.setTargetKey(item.getId());
+                            flowTaskVo.setUserId(flowTaskVo.getUserSid());
                             listResultBean_2= taskReject_(flowTaskVo, true);
 
                         }else{