From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
index 09f6225..f07aaa4 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
@@ -26,6 +26,10 @@
import java.util.List;
import java.util.Map;
+/**
+ * 鏌ヨ鐗╁搧
+ * add by wuxw 2023-01-19
+ */
@Java110Cmd(serviceCode = "resourceStore.listResourceStores")
public class ListResourceStoresCmd extends Cmd {
@@ -52,12 +56,20 @@
basePrivilegeDto.setResource("/viewGroupResource");
basePrivilegeDto.setUserId(userId);
List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
- if (reqJson.containsKey("operationType") && reqJson.getString("operationType").equals("1000") && privileges.size() > 0) {
+ if ("1000".equals(reqJson.getString("operationType")) && privileges.size() > 0) {
resourceStoreDto.setShType("");
resourceStoreDto.setShObjIds(new String[]{reqJson.getString("communityId"), reqJson.getString("storeId")});
} else if (StorehouseDto.SH_TYPE_COMMUNITY.equals(resourceStoreDto.getShType()) || privileges.size() == 0) {
- resourceStoreDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);
+ //add by wuxw 杩欓噷 淇敼涓� 灏忓尯浠撳簱涔熻兘閲囪喘 妯″紡 鎵�浠ヨ繖閲屼笉闄愬埗
+ //resourceStoreDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);
resourceStoreDto.setShObjId(reqJson.getString("communityId"));
+ }
+ BasePrivilegeDto basePrivilegeDto1 = new BasePrivilegeDto();
+ basePrivilegeDto1.setResource("/viewHiddenWarehouse");
+ basePrivilegeDto1.setUserId(userId);
+ List<Map> viewHiddenWarehousePrivileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto1);
+ if (viewHiddenWarehousePrivileges.size() == 0) {
+ resourceStoreDto.setIsShow("true");
}
int count = resourceStoreInnerServiceSMOImpl.queryResourceStoresCount(resourceStoreDto);
List<ApiResourceStoreDataVo> resourceStores = new ArrayList<>();
@@ -68,6 +80,7 @@
if (count > 0) {
resourceStores = BeanConvertUtil.covertBeanList(resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto), ApiResourceStoreDataVo.class);
//鏌ヨ鎬讳环
+ resourceStoreDto.setPage(Integer.valueOf(reqJson.getString("page")));
subTotalPrice = new BigDecimal(resourceStoreInnerServiceSMOImpl.queryResourceStoresTotalPrice(resourceStoreDto));
resourceStoreDto.setPage(PageDto.DEFAULT_PAGE);
totalPrice = new BigDecimal(resourceStoreInnerServiceSMOImpl.queryResourceStoresTotalPrice(resourceStoreDto));
--
Gitblit v1.8.0