Merge remote-tracking branch 'origin/master'

puzhibing

2025-06-05 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6

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

@@ -543,10 +543,6 @@
   @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);