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 | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 fce40b1..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
@@ -1,27 +1,28 @@
package com.java110.web.smo.community.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.StoreTypeConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.web.smo.community.IListCommunitysSMO;
+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.web.smo.community.IListCommunitysManageSMO;
+import com.java110.core.component.AbstractComponentSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import java.util.Map;
/**
- * 鏌ヨ灏忓尯鏈嶅姟绫�
+ * 鏌ヨcommunity鏈嶅姟绫�
*/
@Service("listCommunitysSMOImpl")
-public class ListCommunitysSMOImpl extends AbstractComponentSMO implements IListCommunitysManageSMO {
+public class ListCommunitysSMOImpl extends AbstractComponentSMO implements IListCommunitysSMO {
@Autowired
private RestTemplate restTemplate;
@@ -36,15 +37,21 @@
super.validatePageInfo(pd);
- super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY,PrivilegeCodeConstant.ADMIN_HAS_LIST_COMMUNITY);
}
@Override
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.containsKey("storeId")) {
+ paramIn.put("memberId", paramIn.getString("storeId"));
+ }
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/community.listCommunitys" + mapToUrlParam(paramIn);
--
Gitblit v1.8.0