From 65b30b7cac0a3fdcb8cec19c73411af0e2858766 Mon Sep 17 00:00:00 2001
From: 离歌笑 <137273278@qq.com>
Date: 星期二, 22 十月 2019 16:46:20 +0800
Subject: [PATCH] Merge branch 'tlhhup'
---
WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java b/WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java
index 60a5997..6691e57 100644
--- a/WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java
@@ -1,9 +1,10 @@
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.util.Assert;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.web.smo.community.IAddCommunitySMO;
import org.springframework.web.client.RestTemplate;
import com.java110.core.context.IPageData;
@@ -30,9 +31,8 @@
//Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
Assert.hasKeyAndValue(paramIn, "name", "蹇呭～锛岃濉啓灏忓尯鍚嶇О");
-Assert.hasKeyAndValue(paramIn, "address", "蹇呭～锛岃濉啓灏忓尯鍦板潃");
-Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "蹇呭～锛岃濉啓灏忓尯闄勮繎鍦版爣");
-
+ Assert.hasKeyAndValue(paramIn, "address", "蹇呭～锛岃濉啓灏忓尯鍦板潃");
+ Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "蹇呭～锛岃濉啓灏忓尯闄勮繎鍦版爣");
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
@@ -42,8 +42,10 @@
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ResponseEntity<String> responseEntity = null;
- super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ paramIn.put("storeId", result.getStoreId());
+ paramIn.put("storeTypeCd", result.getStoreTypeCd());
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/community.saveCommunity",
HttpMethod.POST);
--
Gitblit v1.8.0