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/org/impl/EditOrgSMOImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/org/impl/EditOrgSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/org/impl/EditOrgSMOImpl.java
index 323e212..88f1533 100644
--- a/WebService/src/main/java/com/java110/web/smo/org/impl/EditOrgSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/org/impl/EditOrgSMOImpl.java
@@ -1,6 +1,7 @@
package com.java110.web.smo.org.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
@@ -32,7 +33,7 @@
Assert.hasKeyAndValue(paramIn, "orgName", "蹇呭～锛岃濉啓缁勭粐鍚嶇О");
Assert.hasKeyAndValue(paramIn, "orgLevel", "蹇呭～锛岃濉啓鎶ヤ慨浜哄悕绉�");
Assert.hasKeyAndValue(paramIn, "parentOrgId", "蹇呭～锛岃閫夋嫨涓婄骇ID");
- Assert.hasKeyAndValue(paramIn, "description", "蹇呭～锛岃濉啓鎻忚堪");
+ //Assert.hasKeyAndValue(paramIn, "description", "蹇呭～锛岃濉啓鎻忚堪");
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_ORG);
@@ -42,8 +43,10 @@
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ResponseEntity<String> responseEntity = null;
- super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ //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/org.updateOrg",
HttpMethod.POST);
--
Gitblit v1.8.0