From 77c59eafb98d9aed47f44f74f99ae4f1d77d1b7f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 1 Jun 2021 16:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E8=80=83=E8=AF=84=E4=BD=BF=E7=94=A8=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E8=80=83=E8=AF=84=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lz/modules/flow/dao/EvaluationGroupMapper.java  | 5 ++++-
 .../flow/service/impl/EvaluationGroupServiceImpl.java        | 5 ++++-
 src/main/resources/mapper/flow/EvaluationGroupMapper.xml     | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
index a205681f..f437367a 100644
--- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
@@ -35,7 +35,10 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 	int deleteEvaluationGroupById(@Param("id")Long id);
 
 
-	List<EvaluationGroup> seleteEvaluationGroupByReq(@Param("page") IPage page, @Param("req") EvaluationGroupReq req, @Param("list") List<Long> gIds);
+	List<EvaluationGroup> seleteEvaluationGroupByReq(@Param("page") IPage page,
+													 @Param("req") EvaluationGroupReq req,
+													 @Param("list") List<Long> gIds,
+													 @Param("isStart") Boolean isStart);
 
     List<EvaluationGroup> selectEvaluationGroupByIds(@Param("ids") List<Long> ids);
 
diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 7625cba0..a8af783f 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -123,6 +123,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 	@Override
 	public PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req, SysUserEntity sysUserEntity){
 		List<Long> gIds = null;
+		Boolean isStart = false;
 		if(req.getStartId() != null){//发起评分时调用，传发起的id
 			FlowStart flowStart = flowStartService.selectFlowStartById(req.getStartId());
 			if(flowStart == null){
@@ -136,6 +137,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 						}
 					})
 					.collect(Collectors.toList());
+			isStart = true;
 		}else{
 			//考评组管理
 			List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());//一个人只会有一个
@@ -166,8 +168,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
 		}
 		List<Long> finalGIds = gIds;
+		Boolean isStart1 = isStart;
 		PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize())
-				.doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds));
+				.doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds, isStart1));
 		//下面实时统计考核人数
 		List<EvaluationGroup> groups = pageUtils.getList();
 		for (EvaluationGroup group:groups
diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
index 4af838b6..840a0079 100644
--- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
@@ -100,7 +100,8 @@
     </update>
 
     <select id="seleteEvaluationGroupByReq" resultType="EvaluationGroup" >
-        select * from lz_evaluation_group  where is_delete = 0 and copy_id = 0
+        select * from lz_evaluation_group  where is_delete = 0
+        <if test="isStart != false">and copy_id = 0 </if>
 
         <if test="req.startTime != null"><![CDATA[and gmt_create > #{req.startTime}]]></if>
         <if test="req.endTime != null"><![CDATA[and gmt_create < #{req.endTime}]]></if>