From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index 2db9abe..3d0bc43 100755
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -76,30 +76,14 @@
resourceStoreDto.setFileUrls(fileUrls);
}
resourceStoreDtos.add(resourceStoreDto);
- }
- if (resourceResourceStores == null || resourceResourceStores.size() < 1 || resourceResourceStores.size() > 15) {
- return resourceStoreDtos;
- }
- ResourceStoreTimesDto resourceStoreTimesDto = new ResourceStoreTimesDto();
- resourceStoreTimesDto.setStoreId(resourceResourceStoreDto.getStoreId());
- resourceStoreTimesDto.setResCodes(resCodes.toArray(new String[resCodes.size()]));
- List<ResourceStoreTimesDto> resourceStoreTimesDtos = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimess(resourceStoreTimesDto);
-
- if (resourceStoreTimesDtos == null || resourceStoreTimesDtos.size() < 1) {
- return resourceStoreDtos;
- }
-
- List<ResourceStoreTimesDto> times = null;
- for (ResourceStoreDto resourceStoreDto : resourceStoreDtos) {
- times = new ArrayList<>();
- for (ResourceStoreTimesDto tmpResourceStoreTimesDto : resourceStoreTimesDtos) {
- if (resourceStoreDto.getResCode().equals(tmpResourceStoreTimesDto.getResCode())) {
- times.add(tmpResourceStoreTimesDto);
- }
- }
- resourceStoreDto.setTimes(times);
+ ResourceStoreTimesDto resourceStoreTimesDto = new ResourceStoreTimesDto();
+ resourceStoreTimesDto.setStoreId(resourceResourceStoreDto.getStoreId());
+ resourceStoreTimesDto.setResCode(resourceStoreDto.getResCode());
+ resourceStoreTimesDto.setShId(resourceStoreDto.getShId());
+ List<ResourceStoreTimesDto> resourceStoreTimesDtos = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimess(resourceStoreTimesDto);
+ resourceStoreDto.setTimes(resourceStoreTimesDtos);
}
return resourceStoreDtos;
}
--
Gitblit v1.8.0