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
AND es.standard_number LIKE CONCAT('%',#{param.standardNumber},'%')
+
+
+ AND CONCAT(u.realname, '(', u.username, ')') LIKE CONCAT('%',#{param.authUser},'%')
+
AND auth.auth_expire_date BETWEEN #{param.startAuthExpireDate} AND #{param.endAuthExpireDate}
@@ -73,13 +78,6 @@
#{item}
-
-
- AND auth.auth_user IN
-
- #{item}
-
-
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 authUserList;
-
private List 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(","));
- }
- }
}