From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..d3676d5 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;
}
@@ -172,7 +172,8 @@
}
if(Objects.nonNull(sysUser) && sysUser.getUserName().equals(dto.getAccount())) {
// 修改密码
- R res = sysUserClient.resetPassword(sysUser);
+ sysUser.setPassword(dto.getPassword());
+ R res = sysUserClient.siteResetPassword(sysUser);
}
this.updateById(dto);
--
Gitblit v1.7.1