Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 ff8edc9c28ad4f2b98b2cba014af267fd6ba41da

 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查询用户
@@ -465,12 +469,10 @@
            }
                long count = userShopService.count(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()));
            if(0 == count){
                    user.setDelFlag("2");
               userMapper.updateById(user);
               userMapper.deleteUserById(user.getUserId());
                }
            }else{
                user.setDelFlag("2");
            userMapper.updateById(user);
            userMapper.deleteUserById(user.getUserId());
            }
      }
      return 0;