From 8694090b2e1a9d40110a81878052c9576ebfb108 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 12:31:43 +0800
Subject: [PATCH] 优化地区查询功能

---
 WebService/src/main/java/com/java110/web/smo/org/impl/EditOrgSMOImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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..9c91441 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,11 +1,12 @@
 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;
 import com.java110.core.context.IPageData;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
 import com.java110.web.smo.org.IEditOrgSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -32,7 +33,9 @@
         Assert.hasKeyAndValue(paramIn, "orgName", "蹇呭~锛岃濉啓缁勭粐鍚嶇О");
         Assert.hasKeyAndValue(paramIn, "orgLevel", "蹇呭~锛岃濉啓鎶ヤ慨浜哄悕绉�");
         Assert.hasKeyAndValue(paramIn, "parentOrgId", "蹇呭~锛岃閫夋嫨涓婄骇ID");
-        Assert.hasKeyAndValue(paramIn, "description", "蹇呭~锛岃濉啓鎻忚堪");
+        Assert.hasKeyAndValue(paramIn, "belongCommunityId", "蹇呭~锛岃閫夋嫨闅跺睘灏忓尯");
+
+        //Assert.hasKeyAndValue(paramIn, "description", "蹇呭~锛岃濉啓鎻忚堪");
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_ORG);
@@ -42,8 +45,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