Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

2 天以前 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

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

@@ -72,7 +72,7 @@
     * @return 用户信息集合信息

     */

    @Override

    @DataScope(deptAlias = "d", userAlias = "u")

    @DataScope(tenantIdFelid = "u")

    public List<SysUser> selectUserList(SysUser user)

    {

        return userMapper.selectUserList(user);

@@ -555,9 +555,6 @@
     */

    @Override

    public List<SysUser> userListNoPage(SysUser user) {

        //获取登录用户信息

        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(loginUser.getTenantId());

        return userMapper.selectUserList(user);

    }