优化 小区审核时 管理员不验证是否和小区有关系

Api/src/main/java/com/java110/api/listener/community/AuditCommunityListener.java

@@ -65,7 +65,7 @@ public class AuditCommunityListener extends AbstractServiceApiListener {
 
     @Override
     public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_UPDATE_COMMUNITY;
+        return ServiceCodeConstant.SERVICE_CODE_AUDIT_COMMUNITY;
     }
 
     @Override

WebService/src/main/java/com/java110/web/core/BaseComponentSMO.java

@@ -226,6 +226,32 @@ public class BaseComponentSMO extends BaseServiceSMO {
         return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId());
     }
 
+    /**
+     * 校验 员工 商户 关系
+     * <p>
+     * 判断员工和商户是否有关系， 商户和 是否有关系
+     *
+     * @param pd           页面数据封装
+     * @param restTemplate http调用工具
+     * @return ComponentValidateResult 校验对象
+     */
+    protected ComponentValidateResult validateStoreStaffRelationship(IPageData pd, RestTemplate restTemplate) {
+
+        // 校验 员工和商户是否有关系
+        ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, responseEntity.getBody() + "");
+        }
+
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "根据用户ID查询商户ID失败，未包含storeId节点");
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "根据用户ID查询商户类型失败，未包含storeTypeCd节点");
+
+        String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+
+        return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId());
+    }
+
     /**
      * 分页信息校验
      * @param pd 页面数据封装

WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java

@@ -31,9 +31,8 @@ public class AddCommunitySMOImpl extends AbstractComponentSMO implements IAddCom
 
         //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);

WebService/src/main/java/com/java110/web/smo/community/impl/AuditCommunitySMOImpl.java

@@ -41,7 +41,8 @@ public class AuditCommunitySMOImpl extends AbstractComponentSMO implements IAudi
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        //super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        super.validateStoreStaffRelationship(pd, restTemplate);
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/community.auditCommunity",

java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

@@ -511,6 +511,8 @@ public class ServiceCodeConstant {
      */
     public static final String SERVICE_CODE_DELETE_COMMUNITY = "community.deleteCommunity";
 
+    public static final String SERVICE_CODE_AUDIT_COMMUNITY = "community.auditCommunity";
+
 
     /**
      * 保存公告