From d83061ad5d5088eb32c71c32d21dd5db278d503a Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 30 七月 2026 11:49:52 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index 70cf368..5b26f0c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -6,7 +6,6 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
-import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.common.core.domain.R;
@@ -93,8 +92,10 @@
SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
boolean partnerUser = Objects.equals(roleType, 2);
- Map<Integer, GetSiteListDTO> visibleSiteMap = hasSiteFilter ? getVisibleSiteMap(sysUser) : Collections.emptyMap();
- Set<Integer> partnerSiteIds = partnerUser ? getPartnerAppealSiteIds(sysUser) : Collections.emptySet();
+ Map<Integer, GetSiteListDTO> visibleSiteMap = partnerUser || hasSiteFilter
+ ? getVisibleSiteMap(sysUser)
+ : Collections.emptyMap();
+ Set<Integer> partnerSiteIds = partnerUser ? visibleSiteMap.keySet() : Collections.emptySet();
List<TOrderAppeal> res = new ArrayList<>();
for (TOrderAppeal record : page.getRecords()) {
record.setUid(record.getId() + "");
@@ -134,29 +135,19 @@
return R.ok(page);
}
- Set<Integer> getPartnerAppealSiteIds(SysUser sysUser) {
- if (sysUser == null || sysUser.getObjectId() == null) {
- return Collections.emptySet();
- }
- R<Set<Integer>> result = partnerClient.authSite(sysUser.getObjectId(), SiteMenu.ORDER_APPEAL.getValue());
- if (result == null || result.getData() == null) {
- return Collections.emptySet();
- }
- return result.getData().stream()
- .filter(Objects::nonNull)
- .filter(siteId -> siteId > 0)
- .collect(java.util.stream.Collectors.toSet());
- }
-
- private Map<Integer, GetSiteListDTO> getVisibleSiteMap(SysUser sysUser) {
+ Map<Integer, GetSiteListDTO> getVisibleSiteMap(SysUser sysUser) {
if (sysUser == null || sysUser.getUserId() == null) {
return Collections.emptyMap();
}
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(sysUser.getUserId()).getData();
+ R<List<GetSiteListDTO>> result = siteClient.getSiteListByUserId(sysUser.getUserId());
Map<Integer, GetSiteListDTO> siteMap = new HashMap<>();
+ if (result == null || result.getData() == null) {
+ return siteMap;
+ }
+ List<GetSiteListDTO> data = result.getData();
if (data != null) {
for (GetSiteListDTO datum : data) {
- if (datum.getId() != null) {
+ if (datum != null && datum.getId() != null && datum.getId() > 0) {
siteMap.put(datum.getId(), datum);
}
}
--
Gitblit v1.7.1