Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/user/QueryUserPageListRequest.java

@@ -31,6 +31,11 @@ public class QueryUserPageListRequest extends BaseQuery {
      */
     private Integer roleId;
 
+    /**
+     * 部门id
+     */
+    private String deptId;
+
     /**
      * 部门及子部门Id列表
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleServiceImpl.java

@@ -210,7 +210,7 @@ public class RoleServiceImpl implements IRoleService {
         QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
         // 租户ID
         //不展示超管
-        queryWrapper.ne("code", "001");
+        queryWrapper.ne("code", "100001");
         queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
 //        queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
         queryWrapper.eq("status", 1);

tuoheng-service/tuoheng-admin/src/main/resources/mapper/UserMapper.xml

@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="request.username != null and request.username != ''"> and username like concat('%', #{request.username}, '%') </if>
             <if test="request.realname != null and request.realname != ''"> and realname like concat('%', #{request.realname}, '%') </if>
             <if test="request.roleId != null and request.roleId != 0"> and role_id = #{request.roleId} </if>
+            <if test="request.deptId != null and request.deptId != ''"> and dept_id = #{request.deptId} </if>
             <if test="request.deptIdList != null and request.deptIdList.size() > 0">
                 and dept_id in
                 <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">