Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-22 64c7668818aa8272c0aae206a3c0f7007ca38e5d

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -128,6 +128,11 @@
    public List<SysUser> selectUserList(SysUser user) {
        return userMapper.selectUserList(user);
    }
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectAppUserList(SysUser user) {
        return userMapper.selectAppUserList(user);
    }

    /**
     * 根据条件分页查询已分配用户角色列表