用印申请提交流程、获取下一环节用户

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("环节没有用户");
         }

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);
 }

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;
+	}
 }