修改bug

无关风月

2025-01-16 8b8305b82f23b672023d8a3d1d1d7030af3f110c

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

@@ -137,6 +137,10 @@
   public SysUser selectUserByUserName(String userName) {
      return userMapper.selectUserByUserName(userName);
   }
   @Override
   public SysUser selectUserShopByUserName(String userName) {
      return userMapper.selectUserShopByUserName(userName);
   }
   
   /**
    * 通过用户ID查询用户
@@ -296,15 +300,6 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int updateUser(SysUser user) {
//        Long userId = user.getUserId();
//        // 删除用户与角色关联
//        userRoleMapper.deleteUserRoleByUserId(userId);
//        // 新增用户与角色管理
//        insertUserRole(user);
//        // 删除用户与岗位关联
//        userPostMapper.deleteUserPostByUserId(userId);
//        // 新增用户与岗位管理
//        insertUserPost(user);
      return userMapper.updateUser(user);
   }
   
@@ -376,6 +371,10 @@
   @Override
   public int resetUserPwd(String userName, String password) {
      return userMapper.resetUserPwd(userName, password);
   }
   @Override
   public int resetUserShopPwd(String userName, String password) {
      return userMapper.resetUserShopPwd(userName, password);
   }
   
   /**
@@ -451,18 +450,12 @@
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int deleteUserByIds(Long[] userIds) {
   public void deleteUserByIds(Long[] userIds) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = this.getById(userid);
        for (Long userId : userIds) {
         checkUserAllowed(new SysUser(userId));
//            checkUserDataScope(userId);
      }
      // 删除用户与角色关联
//        userRoleMapper.deleteUserRole(userIds);
//        // 删除用户与岗位关联
//        userPostMapper.deleteUserPost(userIds);
//      int i = userMapper.deleteUserByIds(userIds);
      List<SysUser> sysUsers = this.listByIds(Arrays.asList(userIds));
      for (SysUser user : sysUsers) {
         if(2 == user.getRoleType()){
@@ -481,15 +474,12 @@
            }
                long count = userShopService.count(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()));
            if(0 == count){
                    user.setDelFlag("2");
                    this.updateById(user);
               userMapper.deleteUserById(user.getUserId());
                }
            }else{
                user.setDelFlag("2");
                this.updateById(user);
            userMapper.deleteUserById(user.getUserId());
            }
      }
      return 0;
   }
   
   /**