From 9b904f6f9bff3e7af3893d86d19992eb07d66be8 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 21 Nov 2023 09:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E5=8D=B0=E7=94=B3=E8=AF=B7=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=A8=8B=E3=80=81=E8=8E=B7=E5=8F=96=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E7=8E=AF=E8=8A=82=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 3 ++-
 .../java/com/yxt/supervise/system/sysuser/SysUserFeign.java  | 4 ++++
 .../yxt/supervise/system/sysuser/SysUserFeignFallback.java   | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

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<FlowTaskMapper, FlowTask
         UserQuery userQuery = new UserQuery();
         userQuery.setRoleSid(roleSid);
         userQuery.setProjectSid(projectSid);
-        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData();
+//        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData();
+        List<SysUserVo> 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<List<SysUserVo>> getUserByRoleNoOrgPath(@SpringQueryMap UserQuery userQuery);
+    @ApiModelProperty("根据项目和角色获取用户")
+    @GetMapping("getUserByRoleAndProject")
+    public ResultBean<List<SysUserVo>> 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<List<SysUserVo>> getUserByRoleNoOrgPath(UserQuery userQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysUserVo>> getUserByRoleAndProject(UserQuery userQuery) {
+		return null;
+	}
 }
\ No newline at end of file