From 57cbb7df3dcd52707c8d284ecc035bafb190312d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 八月 2020 00:14:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java
index c2d37c9..a3738a8 100644
--- a/service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java
@@ -4,9 +4,9 @@
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeInspectionTaskConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -66,6 +66,10 @@
 
         InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);
 
+        if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
+            inspectionTaskDto.setStates(reqJson.getString("moreState").split(","));
+        }
+
         int count = inspectionTaskInnerServiceSMOImpl.queryInspectionTasksCount(inspectionTaskDto);
 
         List<ApiInspectionTaskDataVo> inspectionTasks = null;

--
Gitblit v1.8.0