Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-19 8fec9579ae4adb4f7f53440933908c90eea33b20

 system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java

@@ -74,6 +74,11 @@
        return userMapper.selectUserList(user);
    }

    @Override
    public List<SysUser> selectUserListNoAuth(SysUser user) {
        return userMapper.selectUserList(user);
    }

    /**
     * 根据条件分页查询已分配用户角色列表
     *
@@ -122,6 +127,11 @@
    public SysUser selectUserById(Long userId)
    {
        return userMapper.selectUserById(userId);
    }

    @Override
    public List<SysUser> selectUserByIds(List<Long> userIds) {
        return userMapper.selectUserByIds(userIds);
    }

    /**
@@ -541,4 +551,9 @@
        }
        return successMsg.toString();
    }

    @Override
    public List<SysUser> getByDept(Long deptId) {
        return userMapper.getByDept(deptId);
    }
}