From db3ab843143e887b37332349c7fe1f93ea91be79 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 27 Dec 2023 17:43:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B-=E8=81=94=E7=BB=9C=E4=BA=BA=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=BA=A7=E9=A2=86=E5=AF=BC=E6=96=B0=E5=A2=9E=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=84=8F=E8=A7=81=E6=8F=90=E5=87=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/esRevision/entity/ProcessEsRevision.java   | 1 +
 .../process/esRevision/service/impl/EsRevisionServiceImpl.java  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 53ab88c8..36908ee5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -171,6 +171,7 @@ public class ProcessEsRevision implements Serializable {
      * 部门联络人主管级领导
      */
     @TableField(exist = false)
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "部门联络人主管级领导")
     private String contactUserLeader;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 29a8eaf8..83ac3117 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -246,6 +246,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                 }
                 break;
+            case CONTACT_USER_DISTRIBUTE:
+                data.setWorkGroup(null);
             case CONTACT_USER_COLLECT:
                 String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader");
                 data.setContactUserLeader(contactUserLeader);