加入商户ID 因为商户ID 是分片字段

wuxw

2019-10-27 9fa80c6005ea82209409df294c95cd3c5515e859

加入商户ID  因为商户ID 是分片字段

 Api/src/main/java/com/java110/api/listener/auditUser/DeleteAuditUserListener.java

@@ -26,7 +26,7 @@
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");

        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
        Assert.hasKeyAndValue(reqJson, "auditUserId", "审核ID不能为空");

    }

 Api/src/main/java/com/java110/api/listener/auditUser/ListAuditUsersListener.java

@@ -8,6 +8,7 @@
import com.java110.dto.auditUser.AuditUserDto;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeAuditUserConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.auditUser.ApiAuditUserDataVo;
import com.java110.vo.api.auditUser.ApiAuditUserVo;
@@ -56,6 +57,8 @@

    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");

        super.validatePageInfo(reqJson);
    }


 Api/src/main/java/com/java110/api/listener/auditUser/SaveAuditUserListener.java

@@ -29,6 +29,7 @@
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");

        Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户");
        Assert.hasKeyAndValue(reqJson, "userName", "必填，请填写用户名称");
        Assert.hasKeyAndValue(reqJson, "auditLink", "必填，请选择审核环节");
        Assert.hasKeyAndValue(reqJson, "objCode", "必填，请填写流程对象");

 Api/src/main/java/com/java110/api/listener/auditUser/UpdateAuditUserListener.java

File was deleted

 WebService/src/main/java/com/java110/web/smo/auditUser/IEditAuditUserSMO.java

File was deleted

 WebService/src/main/java/com/java110/web/smo/auditUser/impl/AddAuditUserSMOImpl.java

@@ -2,6 +2,7 @@

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,8 @@
    @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/auditUser.saveAuditUser",
                HttpMethod.POST);

 WebService/src/main/java/com/java110/web/smo/auditUser/impl/DeleteAuditUserSMOImpl.java

@@ -2,6 +2,7 @@

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,7 +42,8 @@
    @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/auditUser.deleteAuditUser",

 WebService/src/main/java/com/java110/web/smo/auditUser/impl/ListAuditUsersSMOImpl.java

@@ -41,10 +41,12 @@

    @Override
    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
        /*ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);

        Map paramMap = BeanConvertUtil.beanCovertMap(result);
        paramIn.putAll(paramMap);
        paramIn.putAll(paramMap);*/
        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
        paramIn.put("storeId",result.getStoreId());

        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/auditUser.listAuditUsers" + mapToUrlParam(paramIn);


 WebService/src/main/resources/components/auditUserPackage/addAuditUserOtherView/addAuditUserOtherView.js

@@ -36,7 +36,7 @@
                vc.component.addAuditUserOtherViewInfo= {
                    flowComponent: 'addAuditUserOtherView',
                    userId: _staffInfo.userId,
                    userName: _staffInfo.userName,
                    userName: _staffInfo.name,
                    auditLink: '',
                    objCode: '',
                };

 WebService/src/main/resources/components/auditUserPackage/addAuditUserStep/addAuditUserStep.js

@@ -128,10 +128,7 @@
                    return;
                }

                var param = {
                    data: vc.component.addAuditUserStepInfo.infos
                }

              
                vc.http.post(
                    'addAuditUserStepBinding',
                    'binding',