From 4753509c7094646ec9da0da13561f4f943887440 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 14 Dec 2023 09:37:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=AE=B0=E5=BD=95=E4=BA=BA=E5=91=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/EnterpriseStandardAuthUserMapper.xml  | 12 +++++-------
 .../standard/controller/TempAuthRecordQueryDto.java  |  9 ---------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
index cef8d908..3fd84ec9 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
@@ -56,12 +56,17 @@
                     laws_enterprise_standard_auth_user
             ) AS auth
         LEFT JOIN laws_enterprise_standard AS es ON auth.standard_id = es.id
+        LEFT JOIN sys_user AS u ON u.id = auth.auth_user
         WHERE
 	        es.del_flag = 0
         <!--企标编号-->
         <if test="param.standardNumber != null and param.standardNumber != ''">
             AND es.standard_number LIKE CONCAT('%',#{param.standardNumber},'%')
         </if>
+        <!--企标编号-->
+        <if test="param.authUser != null and param.authUser != ''">
+            AND CONCAT(u.realname, '(', u.username, ')')  LIKE CONCAT('%',#{param.authUser},'%')
+        </if>
         <!--授权到期日期-->
         <if test="param.startAuthExpireDate != null and param.endAuthExpireDate != ''">
             AND auth.auth_expire_date BETWEEN #{param.startAuthExpireDate} AND #{param.endAuthExpireDate}
@@ -73,13 +78,6 @@
                 #{item}
             </foreach>
         </if>
-        <!--授权人员-->
-        <if test="param.authUserList != null and param.authUserList.size() > 0">
-            AND auth.auth_user IN
-            <foreach item="item" index="index" collection="param.authUserList" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
     </select>
 
 </mapper>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
index 7f6687ca..dfb4baa5 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
@@ -66,8 +66,6 @@ public class TempAuthRecordQueryDto {
     @ApiModelProperty(value = "标准号")
     private String standardNumber;
 
-    private List<String> authUserList;
-
     private List<String> authDeptList;
 
     public void setAuthDept(String authDept) {
@@ -76,11 +74,4 @@ public class TempAuthRecordQueryDto {
             this.authDeptList = Arrays.asList(authDept.split(","));
         }
     }
-
-    public void setAuthUser(String authUser) {
-        this.authUser = authUser;
-        if (StrUtil.isNotBlank(authUser)) {
-            this.authUserList = Arrays.asList(authUser.split(","));
-        }
-    }
 }