bug修改

xuhy

2025-09-02 26e10e787cdef67370ac1efc437126a27d02e757

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -30,10 +30,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;

/**
 * @author zhibing.pu
@@ -66,8 +63,11 @@
   }

    @Override
    public List<GetSiteListDTO> getSiteListNolimit(GetSiteList siteList) {
      Set<Integer> ids = null;
    public List<GetSiteListDTO> getSiteListNolimit(GetSiteList siteList,SysUser sysUser) {
      Set<Integer> ids = new HashSet<>();
      if(sysUser.getRoleType() != 1){
         ids.add(sysUser.getSiteId());
      }
      List<GetSiteListDTO> list = this.baseMapper.getSiteListNolimit( siteList, ids);
      return list;
    }
@@ -153,26 +153,19 @@
            return AjaxResult.error("账号已存在");
         }
         // 添加登录账号
         SysUser user = new SysUser();
         user.setPhonenumber(dto.getAccount());
         user.setUserName(dto.getAccount());
         user.setNickName(dto.getName());
         user.setPassword(dto.getPassword());
         user.setStatus("0");
         user.setDelFlag("0");
         user.setRoleId(2L);
         user.setSiteId(dto.getId());
         R<Long> r = sysUserClient.addSysUserSite(user);
         sysUser.setPhonenumber(dto.getAccount());
         sysUser.setUserName(dto.getAccount());
         sysUser.setNickName(dto.getName());
         sysUser.setPassword(dto.getPassword());
         R<Boolean> r = sysUserClient.updateUser(sysUser);
         if(200 != r.getCode()){
            throw new RuntimeException(r.getMsg());
         }
         dto.setUserId(r.getData());
         // 删除原有的登录账号
         R res = sysUserClient.delSysUserById(sysUser.getUserId());
      }
      if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount())) {
      if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount()) && StringUtils.isNotEmpty(dto.getPassword())) {
         // 修改密码
         R res = sysUserClient.resetPassword(sysUser);
         sysUser.setPassword(dto.getPassword());
         R res = sysUserClient.siteResetPassword(sysUser);
      }

      this.updateById(dto);