1.修复系统管理和基础数据的bug

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

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

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

@@ -11,4 +11,6 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest {
     private String name;
     private String parentId;
     private Boolean defaultInv;
+
+    private String key;
 }

src/main/java/com/glxp/api/res/auth/DeptUserResponse.java

@@ -10,4 +10,9 @@ public class DeptUserResponse {
     private String userName;
     private String employeeName;
     private String deptName;
+
+    /**
+     * 备注
+     */
+    private String comments;
 }

src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.auth.SysRoleMapper;
@@ -137,6 +138,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
         filterRoleRequest.setNeRoleId(role.getRoleId());
         List<SysRole> sysRoles = sysRoleMapper.selectRoleList(filterRoleRequest);
         if (CollUtil.isNotEmpty(sysRoles)) {
+            for (SysRole sysRole : sysRoles) {
+                if (StrUtil.isNotBlank(sysRole.getRoleName()) && StrUtil.isNotBlank(role.getRoleName()) && !role.getRoleName().equals(sysRole.getRoleName())) {
+                    return Constant.UNIQUE;
+                }
+            }
             return Constant.NOT_UNIQUE;
         } else {
             return Constant.UNIQUE;

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

@@ -6,7 +6,7 @@
     <select id="listAdminPage" parameterType="com.glxp.api.req.auth.FilterAuthUserRequest"
             resultType="com.glxp.api.entity.auth.AuthAdmin">
         SELECT auth_user.*,auth_dept.name deptName
-        FROM auth_user left join auth_dept on auth_user.dept = auth_dept.code
+        FROM auth_user left join auth_dept on auth_user.locDeptCode = auth_dept.code
         <where>
             <if test="ids != null and ids.size > 0">
                 AND id IN
@@ -27,7 +27,7 @@
                 <![CDATA[   and DATE_FORMAT(lastModifyTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="deptCode != null and deptCode != ''">
-                AND dept = #{deptCode}
+                AND auth_user.locDeptCode = #{deptCode}
             </if>
         </where>
         ORDER BY id

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

@@ -22,17 +22,22 @@
 
     <select id="selectJoinDeptUser" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
             resultType="com.glxp.api.res.auth.DeptUserResponse">
-        SELECT auth_dept_user.*,auth_user.userName,auth_user.employeeName,auth_dept.`name` deptName
+        SELECT auth_dept_user.*, auth_user.userName, auth_user.employeeName, auth_dept.`name` deptName, auth_user.comments
-        FROM auth_dept_user INNER JOIN auth_user
+        FROM auth_dept_user
-        on auth_dept_user.userId = auth_user.id
+                 INNER JOIN auth_user
-        INNER JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
+                            on auth_dept_user.userId = auth_user.id
+                 INNER JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
         <where>
-            <if test="deptId != null ">
+            <if test="deptId != null">
                 and deptId = #{deptId}
             </if>
-            <if test="userId != null ">
+            <if test="userId != null">
                 and userId = #{userId}
             </if>
+            <if test="key != null and key != ''">
+                and (auth_user.userName like concat('%', #{key}, '%') or
+                     auth_user.employeeName like concat('%', #{key}, '%'))
+            </if>
         </where>
     </select>
 

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

@@ -216,6 +216,9 @@
             <if test="defaultInv != '' and defaultInv != null">
                 AND a.defaultInv = #{defaultInv}
             </if>
+            <if test="key != null and key != ''">
+                AND a.name like concat('%', #{key}, '%')
+            </if>
         </where>
     </select>
 

src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml

@@ -53,7 +53,7 @@
                 AND `operator_type` = #{operatorType}
             </if>
             <if test="operName != null  ">
-                AND `oper_name` = #{operName}
+                AND auth_user.employeeName like concat('%', #{operName}, '%')
             </if>
             <if test="deptName != null  ">
                 AND `dept_name` = #{deptName}

src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml

@@ -15,6 +15,9 @@
             <if test="paramType!=null">
                 and paramType = #{paramType}
             </if>
+            <if test="key != null and key != ''">
+                AND paramName like CONCAT('%', #{key}, '%')
+            </if>
         </where>
         order BY id
     </select>