From 05acb9dc9978a11520396d7ba00e7988c7fa25b8 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 28 Dec 2020 10:32:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=82=AC=E5=8A=9E?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E8=8A=82=E7=82=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lz/modules/flow/dao/FlowRecordMapper.java |  2 ++
 .../com/lz/modules/flow/service/FlowRecordService.java |  2 ++
 .../flow/service/impl/FlowRecordServiceImpl.java       |  5 +++++
 .../controller/AssessManagerController.java            |  2 +-
 src/main/resources/mapper/flow/FlowRecordMapper.xml    | 10 ++++++++++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
index 01c074e6..6087630f 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
@@ -109,4 +109,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
     List<FlowRecord> selectFlowRecordByRecordIdsFlowProcess(@Param("recordIds") List<Long> recordIds, @Param("flowProcess") Long flowProcess);
 
 	List<FlowRecord> selectFlowRecordByRecordIdsStatus(@Param("recordIds") List<Long> recordIds, @Param("status") int status);
+
+	List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
index f086d980..c0edc4ea 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
@@ -105,4 +105,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
     List<FlowRecord> selectFlowRecordByRecordIdsFlowProcess(List<Long> recordIds, Long flowProcess);
 
 	List<FlowRecord> selectFlowRecordByRecordIdsStatus(List<Long> recordIds, int status);
+
+	List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
index 27b65695..ab37072a 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
@@ -276,4 +276,9 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
 		return flowRecordMapper.selectFlowRecordByRecordIdsStatus(recordIds,status);
 	}
 
+	@Override
+	public List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status){
+		return flowRecordMapper.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, status);
+	}
+
 }
diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
index c4a1f024..e7a2985f 100644
--- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
+++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
@@ -301,7 +301,7 @@ public class AssessManagerController extends AbstractController{
                         log.info("催当前节点的人员，数量{}", flowRecords.size());
                     }else{
                         flowRecords =
-                                flowRecordService.selectFlowRecordByRecordIdsFlowProcess(recordIds, flowProcess);
+                                flowRecordService.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, 2);
                         log.info("催指定节点的人员，数量{}", flowRecords.size());
                     }
 
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index de5d20ee..7b712407 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -384,5 +384,15 @@
 
     </select>
 
+    <select id="selectFlowRecordByRecordIdsFlowProcessAndStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
+        select * from lz_flow_record  where  is_delete = 0
+        and record_id in
+        <foreach item="recordId" collection="recordIds"  open="(" separator="," close=")">
+            #{recordId}
+        </foreach>
+        and flow_process = #{flowProcess} and status=#{status}
+
+    </select>
+
 </mapper>
 

From 1f3fe56bf4c4c0d5999be74f7e1ab2dc0b8064ea Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Mon, 28 Dec 2020 10:57:04 +0800
Subject: [PATCH 2/2] fix

---
 .../performance/service/impl/ChartResultServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
index e85918b2..fd0eafc5 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
@@ -377,7 +377,9 @@ public class ChartResultServiceImpl implements ChartResultService {
                 return Collections.EMPTY_LIST;
             }
             log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds));
-            mandepartmentIds.retainAll(allDeparmentIds);
+            if(CollectionUtils.isNotEmpty(allDeparmentIds)){
+                mandepartmentIds.retainAll(allDeparmentIds);
+            }
             if(mandepartmentIds.size()==0){
                 return Collections.EMPTY_LIST;
             }