接口调用时加入 商户ID

Api/src/main/java/com/java110/api/listener/org/DeleteOrgListener.java

@@ -28,6 +28,7 @@ public class DeleteOrgListener extends AbstractServiceApiListener {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "orgId", "组织ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
 
     }
 

Api/src/main/java/com/java110/api/listener/org/ListOrgsListener.java

@@ -8,6 +8,7 @@ import com.java110.core.smo.org.IOrgInnerServiceSMO;
 import com.java110.dto.org.OrgDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeOrgConstant;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.org.ApiOrgDataVo;
 import com.java110.vo.api.org.ApiOrgVo;
@@ -57,6 +58,7 @@ public class ListOrgsListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
     }
 
     @Override

Api/src/main/java/com/java110/api/listener/org/ListParentOrgsListener.java

@@ -8,6 +8,7 @@ import com.java110.core.smo.org.IOrgInnerServiceSMO;
 import com.java110.dto.org.OrgDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeOrgConstant;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.org.ApiOrgDataVo;
 import com.java110.vo.api.org.ApiOrgVo;
@@ -56,7 +57,9 @@ public class ListParentOrgsListener extends AbstractServiceApiListener {
 
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
+        //super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
+
     }
 
     @Override

Api/src/main/java/com/java110/api/listener/org/SaveOrgListener.java

@@ -32,6 +32,7 @@ public class SaveOrgListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "orgLevel", "必填，请填写报修人名称");
         Assert.hasKeyAndValue(reqJson, "parentOrgId", "必填，请选择上级ID");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
 
     }
 

Api/src/main/java/com/java110/api/listener/org/UpdateOrgListener.java

@@ -30,6 +30,8 @@ public class UpdateOrgListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "orgLevel", "必填，请填写报修人名称");
         Assert.hasKeyAndValue(reqJson, "parentOrgId", "必填，请选择上级ID");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
+
 
     }
 

WebService/src/main/java/com/java110/web/smo/org/impl/AddOrgSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.web.smo.org.impl;
 
 import com.alibaba.fastjson.JSONObject;
 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;
@@ -43,8 +44,9 @@ public class AddOrgSMOImpl extends AbstractComponentSMO implements IAddOrgSMO {
     @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/org.saveOrg",
                 HttpMethod.POST);

WebService/src/main/java/com/java110/web/smo/org/impl/DeleteOrgSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.web.smo.org.impl;
 
 import com.alibaba.fastjson.JSONObject;
 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;
@@ -41,8 +42,10 @@ public class DeleteOrgSMOImpl extends AbstractComponentSMO implements IDeleteOrg
     @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.deleteOrg",
                 HttpMethod.POST);

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;
@@ -42,8 +43,10 @@ public class EditOrgSMOImpl extends AbstractComponentSMO implements IEditOrgSMO
     @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);

WebService/src/main/java/com/java110/web/smo/org/impl/ListParentOrgsSMOImpl.java

@@ -34,7 +34,7 @@ public class ListParentOrgsSMOImpl extends AbstractComponentSMO implements IList
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
 
-        super.validatePageInfo(pd);
+        //super.validatePageInfo(pd);
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_ORG);
     }