From 082ce77a1e3fb68a63a2914d650f3031518ded13 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 1 Dec 2023 13:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/supervise/flowable/biz/flow2/FlowRest.java | 10 ++++++++--
 .../com/yxt/supervise/system/sysuser/SysUserFeign.java |  2 +-
 .../com/yxt/supervise/system/sysuser/SysUserRest.java  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
index 9124bb1b..d582d9b1 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
@@ -72,7 +72,7 @@ public class FlowRest implements FlowFeign {
         if (updateFlowFieldVoResultBean.getSuccess()) {
             log.info("流程返回：{}", JSONObject.toJSONString(updateFlowFieldVoResultBean));
             if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) {
-                try {
+               /* try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
                     ExecutorService pool = new ThreadPoolExecutor(2, 100,
@@ -90,7 +90,13 @@ public class FlowRest implements FlowFeign {
                 } catch (Exception e) {
                     e.printStackTrace();
                     return rb.setMsg("抄送失败");
-                }
+                }*/
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("bv", bv);
+                UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData();
+                ufVo.setTaskId(bv.getTaskId());
+                map.put("uff", ufVo);
+                flowService.cc(map, bv.getTaskDefKey());
             }
         }
         return updateFlowFieldVoResultBean;
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 d2429b39..04e23536 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
@@ -242,5 +242,5 @@ public interface SysUserFeign {
 
     @ApiOperation(value = "根据多个角色sid以及项目sid获取用户")
     @PostMapping(value = "/getUserByRoles")
-    public ResultBean<List<SysUserVo>> getUserByRoles(UserByRolesAndProQuery userQuery);
+    public ResultBean<List<SysUserVo>> getUserByRoles(@RequestBody UserByRolesAndProQuery userQuery);
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
index 668c77e0..1234e92c 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
@@ -774,7 +774,7 @@ public class SysUserRest implements SysUserFeign {
     }
     @ApiOperation(value = "根据多个角色sid以及项目sid获取用户")
     @PostMapping(value = "/getUserByRoles")
-    public ResultBean<List<SysUserVo>> getUserByRoles(UserByRolesAndProQuery userQuery) {
+    public ResultBean<List<SysUserVo>> getUserByRoles(@RequestBody UserByRolesAndProQuery userQuery) {
         return sysUserService.getUserByRoles(userQuery);
     }