diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java index 50c704cc..607c97d5 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java @@ -16,6 +16,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; }, scanBasePackages = { "com.yxt.common.base.config", "org.flowable.ui.modeler", "org.flowable.ui.common","com.yxt.anrui.flowable.*" + ,"com.yxt.supervise.flowable.*" }) @EnableDiscoveryClient @EnableFeignClients(basePackages = {"com.yxt.anrui.*","com.yxt.supervise.*"}) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 805f7c31..a2565d78 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -424,7 +424,7 @@ public class FlowableRest implements FlowableFeign { return rb.setData(new UserAndOrgPath()); }else{ Object o = task_map.get("candidateGroups"); - return flowtaskService.getNextUserSidsNoOrgPath(rb, o); + return flowtaskService.getNextUserSidsNoOrgPath(rb, o,bv.getProjectSid()); } } diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 4de5cc17..e049495f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -2101,20 +2101,20 @@ public class FlowTaskService extends MybatisBaseService getNextUserSidsNoOrgPath(ResultBean rb, Object o) { + public ResultBean getNextUserSidsNoOrgPath(ResultBean rb, Object o,String projectSid) { UserAndOrgPath mapParam=new UserAndOrgPath(); JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o)); String roleSid = jsonArray.get(0).toString(); //根据组织架构、角色两个参数取相关符合条件的用户信息 UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); - //log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery)); + userQuery.setProjectSid(projectSid); List sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData(); - //log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos)); if(sysUserVos==null||sysUserVos.size()<1){ return rb.fail().setMsg("环节没有用户"); } @@ -2127,12 +2127,10 @@ public class FlowTaskService extends MybatisBaseService formVariables =new HashMap<>(); - /* @ApiModelProperty("机构sid:切换结构使用") - private String orgPath;*/ + + @ApiModelProperty("项目sid") + private String projectSid; } diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java index e764f937..9745af3b 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java @@ -18,4 +18,6 @@ public class UserQuery implements Query { @ApiModelProperty(value = "用户部门sid路径是必传项") private String orgSidPath; + private String projectSid; + } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml index 20d3f65c..ce514516 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml @@ -294,7 +294,7 @@ and si.personTypeKey != '01'