Merge branch 'tlhhup'

离歌笑

2019-10-22 65b30b7cac0a3fdcb8cec19c73411af0e2858766

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

@@ -1,9 +1,10 @@
package com.java110.web.smo.community.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.PrivilegeCodeConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.util.Assert;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.web.smo.community.IAddCommunitySMO;
import org.springframework.web.client.RestTemplate;
import com.java110.core.context.IPageData;
@@ -30,9 +31,8 @@

        //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);
@@ -42,8 +42,10 @@
    @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());
        paramIn.put("storeTypeCd", result.getStoreTypeCd());
        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                ServiceConstant.SERVICE_API_URL + "/api/community.saveCommunity",
                HttpMethod.POST);