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 e049495f..04465457 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 @@ -2114,7 +2114,8 @@ public class FlowTaskService extends MybatisBaseService sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData(); +// List sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData(); + List sysUserVos = sysUserFeign.getUserByRoleAndProject(userQuery).getData(); if(sysUserVos==null||sysUserVos.size()<1){ return rb.fail().setMsg("环节没有用户"); } diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java index e23b4836..76b04fd1 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java @@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo; import com.yxt.supervise.system.sysuser.app.AppUserOrgInfoVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; @@ -231,4 +232,7 @@ public interface SysUserFeign { @ApiOperation(value = "获取角色的用户") @GetMapping(value = "getUserByRoleNoOrgPath") ResultBean> getUserByRoleNoOrgPath(@SpringQueryMap UserQuery userQuery); + @ApiModelProperty("根据项目和角色获取用户") + @GetMapping("getUserByRoleAndProject") + public ResultBean> getUserByRoleAndProject(@SpringQueryMap UserQuery userQuery); } \ No newline at end of file diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java index 997ba4a6..a48f7a05 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java @@ -219,4 +219,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean> getUserByRoleNoOrgPath(UserQuery userQuery) { return null; } + + @Override + public ResultBean> getUserByRoleAndProject(UserQuery userQuery) { + return null; + } } \ No newline at end of file