From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/smo/applicationKey/impl/AddApplicationKeySMOImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/applicationKey/impl/AddApplicationKeySMOImpl.java b/WebService/src/main/java/com/java110/web/smo/applicationKey/impl/AddApplicationKeySMOImpl.java
index 95ab90f..e8249f3 100644
--- a/WebService/src/main/java/com/java110/web/smo/applicationKey/impl/AddApplicationKeySMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/applicationKey/impl/AddApplicationKeySMOImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
@@ -12,7 +13,6 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-
/**
@@ -42,6 +42,7 @@
Assert.hasKeyAndValue(paramIn, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
Assert.hasKeyAndValue(paramIn, "locationTypeCd", "蹇呭～锛屼綅缃笉鑳戒负绌�");
Assert.hasKeyAndValue(paramIn, "locationObjId", "蹇呭～锛屾湭閫夋嫨浣嶇疆瀵硅薄");
+ Assert.hasKeyAndValue(paramIn, "typeFlag", "蹇呭～锛屾湭閫夋嫨閽ュ寵绫诲瀷");
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_APPLICATION_KEY);
@@ -51,8 +52,8 @@
@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());
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/applicationKey.saveApplicationKey",
HttpMethod.POST);
--
Gitblit v1.8.0