From 05f53069a91f979ec3d18e0a7abc8ce67c2656b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 04 九月 2025 14:35:01 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index 46944b8..b80f464 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/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);
--
Gitblit v1.7.1