From 144ea5fdde628dd6d83293a1ebee7b16454bec5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 11 Nov 2020 09:39:34 +0800
Subject: [PATCH] fix

---
 .../impl/AssessManagerServiceImpl.java        |  2 +-
 .../sys/dao/app/ResultRecordMapper.java       |  2 +-
 .../mapper/app/ResultRecordMapper.xml         | 22 +++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index c8a901a2..15053ad0 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -116,11 +116,11 @@ public class AssessManagerServiceImpl implements AssessManagerService {
                 res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核")));
             }
             //过滤非自己管理的人员
-            ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId());
             //没有管理的部门
             if(mandepartmentIds!=null && mandepartmentIds.size()==0){
                 res.setJoinNum("0人");
             }else {
+                ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId(),mandepartmentIds);
                 int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId(),mandepartmentIds);
                 res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "等人");
             }
diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index 8ecb0c30..1afbbdd5 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -85,7 +85,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     int countStartAndGroupNum(@Param("startId")Long startId,@Param("departmentIds")List<String> departmentIds);
 
-    ResultRecord selectOneByStartId(@Param("startId")Long startId);
+    ResultRecord selectOneByStartId(@Param("startId")Long startId,@Param("departmentIds")List<String> departmentIds);
 
     List<AssessManagerDetailRes> selectAssessListByStartId(@Param("page") IPage page, @Param("req")AssessDetailReq req);
 
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index c0c48620..f9fc6f6d 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -436,7 +436,15 @@
     </select>
 
     <select id="selectOneByStartId" resultType="com.lz.modules.sys.entity.app.ResultRecord">
-        select * from lz_result_record  where is_delete = 0 and start_id = #{startId} limit 1
+        select * from lz_result_record  where is_delete = 0 and start_id = #{startId}
+        <if test="departmentIds !=null and departmentIds.size()!=0">
+            and department_id in (
+            <foreach collection="departmentIds" item="department_id" separator=",">
+                #{department_id}
+            </foreach>
+            )
+        </if>
+        limit 1
     </select>
 
     <select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
@@ -447,7 +455,7 @@
         and r.start_id = #{req.startId}
         <if test="req.copyEvaluationIds !=null and req.copyEvaluationIds !=''">
             and r.evaluation_id in(
-            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
+            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" separator="">
                 #{evaluation_id}
             </foreach>
             )
@@ -460,7 +468,7 @@
         </if>
         <if test="req.staffIds !=null and req.staffIds !=''">
             and r.staff_id in(
-            <foreach collection="req.staffIds.split(',')" item="staff_id" open="(" separator="," close=")">
+            <foreach collection="req.staffIds.split(',')" item="staff_id"  separator="">
                 #{staff_id}
             </foreach>
             )
@@ -483,7 +491,7 @@
         and r.start_id =#{req.startId}
         <if test="req.copyEvaluationIds !=null and req.copyEvaluationIds !=''">
             and r.evaluation_id in(
-            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
+            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" separator=",">
                 #{evaluation_id}
             </foreach>
             )
@@ -496,7 +504,7 @@
         </if>
         <if test="req.staffIds !=null and req.staffIds !=''">
             and r.staff_id in(
-            <foreach collection="req.staffIds.split(',')" item="staff_id" open="(" separator="," close=")">
+            <foreach collection="req.staffIds.split(',')" item="staff_id" separator=",">
                 #{staff_id}
             </foreach>
             )
@@ -520,7 +528,7 @@
         and r.start_id =#{req.startId}
         <if test="req.copyEvaluationIds !=null and req.copyEvaluationIds !=''">
             and r.evaluation_id in(
-            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
+            <foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id"  separator=",">
                 #{evaluation_id}
             </foreach>
             )
@@ -533,7 +541,7 @@
         </if>
         <if test="req.staffIds !=null and req.staffIds !=''">
             and r.staff_id in(
-            <foreach collection="req.staffIds.split(',')" item="staff_id" open="(" separator="," close=")">
+            <foreach collection="req.staffIds.split(',')" item="staff_id"  separator="," >
                 #{staff_id}
             </foreach>
             )