From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
old mode 100644
new mode 100755
index 554eaaf..c4852da
--- a/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
@@ -1,16 +1,17 @@
 package com.java110.front.smo.ownerRepair.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.AbstractComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.ownerRepair.IAddOwnerRepairSMO;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
-import com.java110.core.component.AbstractComponentSMO;
-import com.java110.front.smo.ownerRepair.IAddOwnerRepairSMO;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -33,7 +34,6 @@
         Assert.hasKeyAndValue(paramIn, "repairType", "蹇呭~锛岃閫夋嫨鎶ヤ慨绫诲瀷");
         Assert.hasKeyAndValue(paramIn, "repairName", "蹇呭~锛岃濉啓鎶ヤ慨浜哄悕绉�");
         Assert.hasKeyAndValue(paramIn, "tel", "蹇呭~锛岃濉啓鎶ヤ慨浜烘墜鏈哄彿");
-        Assert.hasKeyAndValue(paramIn, "roomId", "蹇呭~锛岃濉啓鎴垮眿ID");
         Assert.hasKeyAndValue(paramIn, "appointmentTime", "蹇呭~锛岃濉啓棰勭害鏃堕棿");
         Assert.hasKeyAndValue(paramIn, "context", "蹇呭~锛岃濉啓鎶ヤ慨鍐呭");
 
@@ -45,8 +45,11 @@
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult commonValidateResult = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
 
+        paramIn.put("userId", commonValidateResult.getUserId());
+        paramIn.put("userName", commonValidateResult.getUserName());
+        paramIn.put("storeId", commonValidateResult.getStoreId());
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/ownerRepair.saveOwnerRepair",
                 HttpMethod.POST);

--
Gitblit v1.8.0