From c79752db2a3f3f073742dc94a8d1df2c01674786 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 30 Apr 2024 16:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8A=84=E9=80=81=E8=8B=A5?=
 =?UTF-8?q?=E6=8A=84=E9=80=81=E7=9A=84=E7=94=A8=E6=88=B7=E5=B7=B2=E5=9C=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=91=98=E4=B8=AD=EF=BC=88=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=9C=89=E8=AF=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=89=EF=BC=8C=E5=88=99=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E6=8A=84=E9=80=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/biz/flow2/FlowMapper.java     | 2 ++
 .../java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml | 9 ++++++++-
 .../com/yxt/anrui/flowable/biz/flow2/FlowService.java    | 9 ++++++++-
 .../flowable/biz/processcomment/ProcessCommentMapper.xml | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
index 01289c9b03..06d0e65588 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
@@ -31,4 +31,6 @@ public interface FlowMapper extends BaseMapper<Flowable> {
     FlowableMessageVo getApprovalResult(@Param("proDefId") String proDefId, @Param("procInstId") String procInstId);
 
     String getComment(@Param("taskId") String taskId, @Param("procInstId") String procInstId);
+
+    List<String> selectByProcInstId(String instanceId);
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
index 134b4ca73b..412f091fac 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
@@ -57,7 +57,8 @@
         WHERE PROC_INST_ID_ = #{procInstId}
           AND PROC_DEF_ID_ = #{proDefId}
           AND ACT_TYPE_ = 'userTask'
-        ORDER BY ID_ DESC limit 1
+        ORDER BY ID_ DESC
+        limit 1
     </select>
     <select id="getComment" resultType="java.lang.String">
         SELECT TYPE_
@@ -65,4 +66,10 @@
         WHERE TASK_ID_ = #{taskId}
           AND PROC_INST_ID_ = #{procInstId}
     </select>
+
+    <select id="selectByProcInstId" resultType="java.lang.String">
+        select ASSIGNEE_
+        from act_hi_taskinst
+        where PROC_INST_ID_ = #{instanceId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
index 5f885049e3..d015406fb2 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
@@ -757,7 +757,14 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
             userSids.append(zbUser).append(",");
         }
         userSids.deleteCharAt(userSids.length() - 1);
-        mfq.setUserSids(userSids.toString());
+        //若抄送的用户已在审批人员中（审批记录中有该用户），则该用户不抄送
+        List<String> taskinstUserSidList = baseMapper.selectByProcInstId(bv.getInstanceId());
+        List<String> uss = Arrays.asList(userSids.toString().split(","));
+        List<String> uniqueList = new ArrayList<String>(new HashSet<String>(uss));
+        uniqueList.removeIf(taskinstUserSidList::contains);
+        String userSidss = String.join(",",uniqueList);
+        mfq.setUserSids(userSidss);
+//        mfq.setUserSids(userSids.toString());
         mfq.setOrgPath(createrOrgPath);
         mfq.setUserSid(assignee);
         mfq.setApplicationName(assigneeName);
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml
index b44df399cb..0c95e1313f 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml
@@ -19,6 +19,6 @@
 	</insert>
 
 	<select id="selectByIdAndComment" resultType="java.lang.String">
-		select reviewerSid from process_comment where content like concat('%',#{comment}) and processId = #{instanceId}
+		select reviewerSid from process_comment where content like concat('%',#{comment},'%') and processId = #{instanceId}
     </select>
 </mapper>
\ No newline at end of file