From 8c67cd6961fc7aa23ccd663a57e2a2d729cf456b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 3 Nov 2023 17:42:47 +0800
Subject: [PATCH] fix: 77906
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

企业标准--导入和新增 选择相同的人员，回显不一样，要如何统一
---
 .../entity/vo/ESAbolishFlowUserVO.java        |  8 +++---
 .../entity/ProcessEsAnnualInit.java           |  8 +++---
 .../entity/vo/AnnualInitFlowUserVO.java       | 14 +++++-----
 .../impl/ProcessEsAnnualInitServiceImpl.java  |  8 +++---
 .../entity/ProcessEsAnnualReport.java         | 16 +++++------
 .../entity/vo/AnnualReportFlowUserVO.java     | 10 +++----
 .../ProcessEsAnnualReportServiceImpl.java     |  6 ++--
 .../entity/vo/ESArchiveFlowUserVO.java        |  8 +++---
 .../entity/vo/ESChangeFlowUserVO.java         | 10 +++----
 .../entity/vo/ESEnableFlowUserVO.java         |  8 +++---
 .../entity/ProcessEsInitChange.java           | 28 +++++++++----------
 .../entity/vo/InitChangeFlowUserVO.java       | 22 +++++++--------
 .../entity/vo/ESRecheckFlowUserVO.java        |  8 +++---
 .../modules/laws/common/util/ImportUtil.java  | 15 +++++-----
 .../entity/EnterpriseStandardPlan.java        |  6 ++--
 .../entity/vo/EnterpriseStandardPlanVo.java   | 12 ++++----
 .../library/entity/LawsProblemLibrary.java    |  2 +-
 .../laws/standard/entity/LawsNewsFeed.java    |  4 +--
 18 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java
index 3e4b9b48..1328b428 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java
@@ -11,22 +11,22 @@ import lombok.Data;
 @Data
 public class ESAbolishFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("发起人")
     private String createUser;
 
     // 相关人员
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("相关人员")
     private String relatedUser;
 
     // 主起草人主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("起草人和会签人主管级领导")
     private String leader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationUser;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
index d7b4266c..b53504fd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
@@ -232,7 +232,7 @@ public class ProcessEsAnnualInit implements Serializable {
      * 主起草人
      */
     @Excel(name = "*主起草人", width = 15, orderNum = "10")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -248,12 +248,12 @@ public class ProcessEsAnnualInit implements Serializable {
      * 主起草单位责任人
      */
     @Excel(name = "*起草单位责任人", width = 20, orderNum = "12")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
     @Excel(name = "*标准推进人", width = 15, orderNum = "16")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
@@ -311,7 +311,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 流程中的主起草人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "流程中的主起草人")
     private String prcMainDraftUser;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitFlowUserVO.java
index 2a07bc4c..0fd0cc5c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitFlowUserVO.java
@@ -15,38 +15,38 @@ import java.util.List;
 @Data
 public class AnnualInitFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化工程师")
     private String standardEngineer;
 
     // 部所联络人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("各部所联络人")
     private String contactUser;
 
     // 部所联络人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("各部所联络人集合")
     @JsonIgnore
     private List<String> contactUserList;
 
     // 主起草单位主管
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草单位主管")
     private String approvalUser;
 
     // 主起草单位主管
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草单位主管集合")
     private List<String> approvalUserList;
 
     // 主起草人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人")
     private String mainDraftUser;
 
     // 主起草人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人集合")
     @JsonIgnore
     private List<String> mainDraftUserList;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 3d10f455..34b707d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -415,11 +415,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             item.setAuthDept(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getAuthDept(), listDict));
             item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
             item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
-            item.setMainDraftingUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUser(), listDict));
+            item.setMainDraftingUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUser(), listDict));
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
-            item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
-            item.setStandardPromoter(excelUtils.translateDictValue("username", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setContactUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getContactUser(), listDict));
+            item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
+            item.setStandardPromoter(excelUtils.translateDictValue("realname", "id", "sys_user", item.getStandardPromoter(), listDict));
+            item.setContactUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getContactUser(), listDict));
         });
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
index 43c09382..63cac4ec 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
@@ -232,7 +232,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 主起草人
      */
     @Excel(name = "*主起草人", width = 15, orderNum = "8")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -248,7 +248,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 主起草单位责任人
      */
     @Excel(name = "*起草单位责任人", width = 20, orderNum = "9")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
@@ -256,7 +256,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 标准推进人
      */
     @Excel(name = "*标准推进人", width = 15, orderNum = "11")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
@@ -337,35 +337,35 @@ public class ProcessEsAnnualReport implements Serializable {
     /**
      * 部门联络人
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "部门联络人")
     private String contactUser;
 
     /**
      * 工作组所联络人
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "工作组所联络人")
     private String workGroupUser;
 
     /**
      * 工作组所联络人集合
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "工作组所联络人集合")
     private String workGroupUserList;
 
     /**
      * 联络人主管级上一级领导
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "联络人主管级上一级领导")
     private String contactUserLeaderLeader;
 
     /**
      * 收集联络人主管级领导
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "收集联络人主管级领导")
     private String collectUserLeader;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/vo/AnnualReportFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/vo/AnnualReportFlowUserVO.java
index 234a5027..fc0d3c09 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/vo/AnnualReportFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/vo/AnnualReportFlowUserVO.java
@@ -11,27 +11,27 @@ import lombok.Data;
 @Data
 public class AnnualReportFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化工程师")
     private String standardEngineer;
 
     // 部所联络人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("个部所联络人")
     private String contactUserList;
 
     // 标准专家
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("工作组联络人")
     private String workGroupUserList;
 
     // 主起草人主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("收集联络人主管级领导")
     private String collectUserLeader;
 
     // 主起草人主管级领导上级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("联络人主管级上级领导")
     private String contactUserLeaderLeader;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 7b83dad0..6d15ee3b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -401,10 +401,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
             item.setAuthDept(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getAuthDept(), listDict));
             item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
-            item.setMainDraftingUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUser(), listDict));
+            item.setMainDraftingUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUser(), listDict));
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
-            item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
-            item.setStandardPromoter(excelUtils.translateDictValue("username", "id", "sys_user", item.getStandardPromoter(), listDict));
+            item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
+            item.setStandardPromoter(excelUtils.translateDictValue("realname", "id", "sys_user", item.getStandardPromoter(), listDict));
             item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
         });
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveFlowUserVO.java
index bcc86f42..32f84eb3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveFlowUserVO.java
@@ -12,22 +12,22 @@ import lombok.Data;
 public class ESArchiveFlowUserVO {
 
     // 创建人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("创建人")
     private String createUser;
 
     // 相关人员
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("相关人员")
     private String relatedUser;
 
     // 创建人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("起草人和会签人主管级领导")
     private String leader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationUser;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeFlowUserVO.java
index 847d53c2..8834bfe7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeFlowUserVO.java
@@ -11,27 +11,27 @@ import lombok.Data;
 @Data
 public class ESChangeFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人")
     private String mainDraftUser;
 
     // 主起草人主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导")
     private String mainDraftUserLeader;
 
     // 主起草人主管级领导上级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导上级领导")
     private String mainDraftUserLeaderLeader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationUser;
 
     // 相关人员
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("相关人员")
     private String relatedUser;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableFlowUserVO.java
index 59b20100..f7f8c4f5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableFlowUserVO.java
@@ -12,22 +12,22 @@ import lombok.Data;
 public class ESEnableFlowUserVO {
 
     // 创建人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("创建人")
     private String createUser;
 
     // 相关人员
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("相关人员")
     private String relatedUser;
 
     // 创建人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("起草人和会签人主管级领导")
     private String leader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationUser;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
index 99a3ebf1..df27bcd4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
@@ -304,7 +304,7 @@ public class ProcessEsInitChange implements Serializable {
     @ApiModelProperty(value = "零部件名称")
     private String componentName;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -312,18 +312,18 @@ public class ProcessEsInitChange implements Serializable {
     @ApiModelProperty(value = "主起草单位")
     private String mainDraftingUnit;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
     /**
      * 新主起草单位负责人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "新主起草单位负责人")
     private String newMainDraftingUnitResponsiblePerson;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
@@ -446,7 +446,7 @@ public class ProcessEsInitChange implements Serializable {
     /**
      * 新主起草人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "新主起草人")
     private String newMainDraftingUser;
 
@@ -460,63 +460,63 @@ public class ProcessEsInitChange implements Serializable {
     /**
      * 部所联络人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "部所联络人")
     private String contactUser;
 
     /**
      * 标准专家
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准专家")
     private String standardExpert;
 
     /**
      * 主起草人主管级领导
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人主管级领导")
     private String mainDraftUserLeader;
 
     /**
      * 主起草人主管级领导上级领导
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人主管级领导上级领导")
     private String mainDraftUserLeaderLeader;
 
     /**
      * 标准化审批人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准化审批人")
     private String standardizationApprovalUser;
 
     /**
      * 新主起草部门领导的领导
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "新主起草部门领导的领导")
     private String newMainDraftUserLeaderLeader;
 
     /**
      * 新主起草部门领导
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "新主起草部门领导")
     private String newMainDraftUserLeader;
 
     /**
      * 相关人员
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "相关人员")
     private String relatedUser;
 
     /**
      * 抄送人
      */
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "抄送人")
     private String copyUser;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java
index eecbb635..4fb534f7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java
@@ -11,57 +11,57 @@ import lombok.Data;
 @Data
 public class InitChangeFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人")
     private String mainDraftUser;
 
     // 部所联络人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("部所联络人")
     private String contactUser;
 
     // 标准专家
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准专家")
     private String standardExpert;
 
     // 主起草人主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导")
     private String mainDraftUserLeader;
 
     // 主起草人主管级领导上级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导上级领导")
     private String mainDraftUserLeaderLeader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationApprovalUser;
 
     // 新起草部门主管级领导上级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("新起草部门主管级领导上级领导")
     private String newMainDraftUserLeaderLeader;
 
     // 新起草部门主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("新起草部门主管级领导")
     private String newMainDraftUserLeader;
 
     // 相关人员
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("相关人员")
     private String relatedUser;
 
     // 抄送人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("抄送人")
     private String copyUser;
     
     // 创建人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("创建人")
     private String createUser;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckFlowUserVO.java
index a9ce26ca..c199afb4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckFlowUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckFlowUserVO.java
@@ -11,22 +11,22 @@ import lombok.Data;
 @Data
 public class ESRecheckFlowUserVO {
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人")
     private String mainDraftUser;
 
     // 主起草人主管级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导")
     private String mainDraftUserLeader;
 
     // 标准化审批人
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("标准化审批人")
     private String standardizationUser;
 
     // 主起草人主管级领导上级领导
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty("主起草人主管级领导上级领导")
     private String mainDraftUserLeaderLeader;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 2e9b22bb..13aaf08f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -3,6 +3,7 @@ package com.jero.modules.laws.common.util;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.DictModel;
@@ -336,9 +337,9 @@ public class ImportUtil {
     
     // 单选用户转换
     public String convertSingleUserId(String cellValue) {
-        LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
-        return sysUserService.getOne(sysUserLambdaQueryWrapper).getId();
+        QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+        wrapper.apply("CONCAT(realname, '(', username, ')') = {0}", cellValue);
+        return sysUserService.getOne(wrapper).getId();
     }
 
     // 零部件转换
@@ -425,11 +426,11 @@ public class ImportUtil {
         return Objects.nonNull(sysDepartService.getOne(sysDepartLambdaQueryWrapper));
     }
 
-    // 单选人员
+    // 改为校验人员+姓名 单选人员
     public boolean singleUserValid(String cellValue) {
-        LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
-        return Objects.nonNull(sysUserService.getOne(sysUserLambdaQueryWrapper));
+        QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+        wrapper.apply("CONCAT(realname, '(', username, ')') = {0}", cellValue);
+        return Objects.nonNull(sysUserService.getOne(wrapper));
     }
 
     // 多选组织机构
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
index e296a6e3..67f6f0d1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
@@ -143,7 +143,7 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     private String authDept;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -151,11 +151,11 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "主起草单位")
     private String mainDraftingUnit;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
index cdb9abf1..9e6fa26e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
@@ -61,8 +61,8 @@ public class EnterpriseStandardPlanVo {
     @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;
 
-    @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -71,13 +71,13 @@ public class EnterpriseStandardPlanVo {
     @ApiModelProperty(value = "主起草单位")
     private String mainDraftingUnit;
 
-    @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
-    @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java
index ab7046bd..ddbfd706 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java
@@ -111,7 +111,7 @@ public class LawsProblemLibrary implements Serializable {
 	/**发帖人id*/
 	@Excel(name = "发帖人id", width = 15)
     @ApiModelProperty(value = "发帖人id")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private java.lang.String userId;
 
     /**回答列表*/
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
index bba2e274..3e36035f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
@@ -97,7 +97,7 @@ public class LawsNewsFeed implements Serializable {
     private java.lang.Integer readCount;
     /**编辑人*/
     @ApiModelProperty(value = "编辑人")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String writer;
 
     /**推送范围标识（1-指定用户、2-全体用户）*/
@@ -108,7 +108,7 @@ public class LawsNewsFeed implements Serializable {
 
     @ApiModelProperty(value = "推送范围")
     @TableField(exist = false)
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String pushRange;
 
     @ApiModelProperty(value = "是否可以编辑和删除")