Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-09 74b2581c8a9be309ca6454da3ff2c56501368771

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

@@ -455,12 +455,6 @@
      for (SysUser user : sysUsers) {
         if(2 == user.getRoleType()){
            userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
            UserShop userShop = new UserShop();
            userShop.setUserId(user.getUserId());
            userShop.setShopId(user.getObjectId());
            userShop.setRoleType(2);
            userShop.setRoleId(user.getRoleId());
            userShopService.save(userShop);
         }
      }
      return i;
@@ -533,6 +527,16 @@
      }
      List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
      for (SysUser sysUser : list) {
         if(sysUser.getRoleType() == 2){
            UserShop userShop = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, sysUser1.getObjectId()).eq(UserShop::getUserId, sysUser.getUserId()));
            SysRole sysRole = roleMapper.selectRoleById(userShop.getRoleId());
            Long[] roleIds = new Long[]{userShop.getRoleId()};
            sysUser.setNickName(userShop.getNickName());
            sysUser.setRoleIds(roleIds);
            sysUser.setRoleNames(Arrays.asList(sysRole.getRoleName()));
            SysDept sysDept = deptService.selectDeptById(userShop.getDeptId());
            sysUser.setDept(sysDept);
         }else{
         List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
         List<String> roleNames = new ArrayList<>();
         for (SysUserRole sysUserRole : list1) {
@@ -548,6 +552,7 @@
            SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
            sysUser.setDept(sysDept);
      }
      }
      return pageInfo.setRecords(list);
   }