diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 3236fa5f6b..1fce1a0098 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.biz.baseoutsourcingapplication; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -529,24 +530,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> nextNodesForSubmit = getNextNodesForSubmit(dto); - List datas = nextNodesForSubmit.getData(); - GetNodeVo getNodeVo = datas.get(0); - List candidateGroups = getNodeVo.getCandidateGroups(); - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid(candidateGroups.get(0)); - userQuery.setOrgSidPath(bv.getOrgSidPath()); - List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); - ResultBean rb = flowableFeign.handleProsess(bv); - if(sysUserVos.size()==0){ - bv.setTaskDefKey(rb.getData().getTaskDefKey()); - bv.setTaskId(rb.getData().getTaskId()); - return complete(bv); - }*/ BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid()); ResultBean rb = complete_handleProsess(bv,dto); - /* String taskDefKey = rb.getData().getTaskDefKey(); + String taskDefKey = rb.getData().getTaskDefKey(); Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap); if ("Event_end".equals(taskDefKey)) { @@ -573,12 +559,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) { - ResultBean> nextNodesForSubmit = getNextNodesForSubmit(dto); - List datas = nextNodesForSubmit.getData(); - GetNodeVo getNodeVo = datas.get(0); - List candidateGroups = getNodeVo.getCandidateGroups(); ResultBean rb = flowableFeign.handleProsess(bv); Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap);