Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 e7f23c16b1d1c6553a0442f3d0d129248d267670

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

@@ -509,6 +509,11 @@
   
   @Override
   public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
      Long userid = tokenService.getLoginUser().getUserid();
      SysUser sysUser1 = this.getById(userid);
      if(sysUser1.getRoleType() == 2){
         getSysUserList.setObjectId(sysUser1.getObjectId());
      }
      List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
      for (SysUser sysUser : list) {
         List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
@@ -541,6 +546,11 @@
   
   @Override
   public PageInfo<SysUser> getChangeUserList(ChangeUserQuery query) {
      Long userid = tokenService.getLoginUser().getUserid();
      SysUser sysUser1 = this.getById(userid);
      if(sysUser1.getRoleType() == 2){
         query.setObjectId(sysUser1.getObjectId());
      }
      PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
      List<SysUser> list = this.baseMapper.getChangeUserList(pageInfo, query);
      return pageInfo.setRecords(list);