From 1c9c4d0b6cd221e685a30b1c8aef53349d45cde0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 18 二月 2020 00:05:40 +0800
Subject: [PATCH] 管理员加入商户小区开发完成
---
WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java
index a2eb87d..d4e51c0 100644
--- a/WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java
@@ -10,7 +10,7 @@
import org.springframework.web.client.RestTemplate;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
@@ -44,12 +44,13 @@
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
- Map paramMap = BeanConvertUtil.beanCovertMap(result);
- paramIn.putAll(paramMap);
+ if(!paramIn.containsKey("storeId")) {
+ Map paramMap = BeanConvertUtil.beanCovertMap(result);
+ paramIn.putAll(paramMap);
+ }
-
- if(!StoreTypeConstant.STORE_TYPE_SYSTEM_MANAGER.equals(result.getStoreTypeCd())) {
- paramIn.put("memberId", result.getStoreId());
+ if(!StoreTypeConstant.STORE_TYPE_SYSTEM_MANAGER.equals(result.getStoreTypeCd()) || paramIn.containsKey("storeId")) {
+ paramIn.put("memberId", paramIn.getString("storeId"));
}
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/community.listCommunitys" + mapToUrlParam(paramIn);
--
Gitblit v1.8.0