yijiusmile
2021-03-14 6ad15600563934e9718a467e94cb359167f12d9f
用户管理增加部门权限控制
3个文件已修改
10 ■■■■■ 已修改文件
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserMapper.java
@@ -21,7 +21,7 @@
     * @param <T>  type
     * @return Ipage
     */
    <T> IPage<SystemUser> findUserDetailPage(Page<T> page, @Param("user") SystemUser user);
    <T> IPage<SystemUser> findUserDetailPage(Page<T> page, @Param("user") SystemUser user,@Param("currentUserId") String currentUserId);
    /**
     * 查找用户详细信息
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -55,8 +55,9 @@
    @Override
    public IPage<SystemUser> findUserDetailList(SystemUser user, QueryRequest request) {
        Page<SystemUser> page = new Page<>(request.getPageNum(), request.getPageSize());
        String currentUserId= FebsUtil.getUserId();
        SortUtil.handlePageSort(request, page, "userId", FebsConstant.ORDER_ASC, false);
        return this.baseMapper.findUserDetailPage(page, user);
        return this.baseMapper.findUserDetailPage(page, user, currentUserId);
    }
    @Override
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -45,11 +45,12 @@
            AND d.dept_name like CONCAT('%',#{user.deptName},'%')
        </if>
        <if test="user.createTimeFrom != null and user.createTimeFrom !=''">
            And u.create_time &gt; #{user.createTimeFrom}
            AND u.create_time &gt; #{user.createTimeFrom}
        </if>
        <if test="user.createTimeTo!= null and user.createTimeTo !=''">
            And u.create_time &lt; #{user.createTimeTo}
            AND u.create_time &lt; #{user.createTimeTo}
        </if>
        AND d.DEPT_ID IN (SELECT DEPT_ID FROM t_user_data_permission WHERE USER_ID= #{currentUserId} )
        group by u.username,u.user_id,u.email,u.mobile,u.status,u.create_time,u.ssex,
        u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
    </select>