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

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

@@ -26,7 +26,7 @@ public class DeleteAuditUserListener extends AbstractServiceApiListener {
     @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.core.smo.auditUser.IAuditUserInnerServiceSMO;
 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 @@ public class ListAuditUsersListener extends AbstractServiceApiListener {
 
     @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 @@ public class SaveAuditUserListener extends AbstractServiceApiListener {
         //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

@@ -1,95 +0,0 @@
-package com.java110.api.listener.auditUser;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.AppService;
-import com.java110.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeAuditUserConstant;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-
-/**
- * 保存审核人员侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateAuditUserListener")
-public class UpdateAuditUserListener extends AbstractServiceApiListener {
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "auditUserId", "审核ID不能为空");
-Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
-Assert.hasKeyAndValue(reqJson, "userName", "必填，请填写用户名称");
-Assert.hasKeyAndValue(reqJson, "auditLink", "必填，请选择审核环节");
-Assert.hasKeyAndValue(reqJson, "objCode", "必填，请填写流程对象");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        HttpHeaders header = new HttpHeaders();
-        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
-        JSONArray businesses = new JSONArray();
-
-        AppService service = event.getAppService();
-
-        //添加单元信息
-        businesses.add(updateAuditUser(reqJson, context));
-
-        JSONObject paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
-
-        //将 rest header 信息传递到下层服务中去
-        super.freshHttpHeader(header, context.getRequestCurrentHeaders());
-
-        ResponseEntity<String> responseEntity = this.callService(context, service.getServiceCode(), paramInObj);
-
-        context.setResponseEntity(responseEntity);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeAuditUserConstant.UPDATE_AUDITUSER;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    /**
-     * 添加审核人员信息
-     *
-     * @param paramInJson     接口调用放传入入参
-     * @param dataFlowContext 数据上下文
-     * @return 订单服务能够接受的报文
-     */
-    private JSONObject updateAuditUser(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_AUDIT_USER);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-        JSONObject businessAuditUser = new JSONObject();
-        businessAuditUser.putAll(paramInJson);
-        //计算 应收金额
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessAuditUser", businessAuditUser);
-        return business;
-    }
-
-}

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

@@ -1,19 +0,0 @@
-package com.java110.web.smo.auditUser;
-
-import com.java110.core.context.IPageData;
-import org.springframework.http.ResponseEntity;
-
-/**
- * 修改审核人员接口
- *
- * add by wuxw 2019-06-30
- */
-public interface IEditAuditUserSMO {
-
-    /**
-     * 修改小区
-     * @param pd 页面数据封装
-     * @return ResponseEntity 对象
-     */
-    ResponseEntity<String> updateAuditUser(IPageData pd);
-}

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

@@ -2,6 +2,7 @@ package com.java110.web.smo.auditUser.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,8 @@ public class AddAuditUserSMOImpl extends AbstractComponentSMO implements IAddAud
     @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 @@ package com.java110.web.smo.auditUser.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,7 +42,8 @@ public class DeleteAuditUserSMOImpl extends AbstractComponentSMO implements IDel
     @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 @@ public class ListAuditUsersSMOImpl extends AbstractComponentSMO implements IList
 
     @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',