Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -12,6 +12,8 @@ public class FilterAuthUserRequest extends ListPageRequest {
 
     private String userName;
 
+    private String deptName;
+
     private Integer userFlag;
 
     private Long roleId;

src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java

@@ -7,6 +7,6 @@ import lombok.Data;
 public class FilterDeptUserReqeust extends ListPageRequest {
     private Long deptId;
     private Long userId;
-
+    private String deptName;
     private String key;
 }

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -23,6 +23,12 @@
             <if test="neUserName != null and '' != neUserName">
                 AND userName != #{neUserName}
             </if>
+            <if test="deptName != null and '' != deptName">
+                AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%')
+            </if>
+            <if test="deptName != null and '' != deptName">
+                AND auth_dept.name != #{deptName}
+            </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
                 and DATE_FORMAT(lastModifyTime

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -45,7 +45,7 @@
                 )
             </if>
             <if test="outType != null">
-                AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
+                AND (outType = #{outType} or outType is NULL)
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[