Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 9153a858f1ae61fa29bb7a926e7d50359117cd69

 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查询用户
@@ -441,6 +445,7 @@
    * @return 结果
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int deleteUserByIds(Long[] userIds) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = this.getById(userid);