From baea4f5679dba13a99de960e3891635968dbe35c Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 10:25:34 +0800
Subject: [PATCH] 优化巡检计划AddInspectionPlanSMOImpl

---
 WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java
index 0598baf..8e590cf 100644
--- a/WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java
@@ -1,14 +1,15 @@
 package com.java110.web.smo.ownerRepair.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.client.RestTemplate;
+import com.java110.utils.util.Assert;
+import org.springframework.web.client.RestTemplate;
 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.exception.SMOException;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
 import com.java110.web.smo.ownerRepair.IListOwnerRepairsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -35,6 +36,8 @@
     protected void validate(IPageData pd, JSONObject paramIn) {
 
         super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
+
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_OWNERREPAIR);
     }
@@ -46,6 +49,10 @@
         Map paramMap = BeanConvertUtil.beanCovertMap(result);
         paramIn.putAll(paramMap);
 
+        if(paramIn.containsKey("pageFlag") && "myRepairDispatch".equals(paramIn.getString("pageFlag"))){
+            paramIn.put("staffId", result.getUserId());
+        }
+
         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/ownerRepair.listOwnerRepairs" + mapToUrlParam(paramIn);
 
 

--
Gitblit v1.8.0