From 60017b524e033576598d26a635d34928714d1f92 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 30 Oct 2020 11:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowStartServiceImpl.java    | 22 -------------------
 .../resources/mapper/generator/StaffDao.xml   |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index 5f28a574..34f7fc6f 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -251,18 +251,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 
 		//获取绩效考核管理员
 		List<StaffEntity> staffManagers = staffService.selectStaffsByGroupId(evaluationGroup.getCopyId());
-		/*if(!StringUtil.isEmpty(evaluationGroup.getManagerIds())){
-			List<Long> mIds = Arrays.stream(evaluationGroup.getManagerIds().split(","))
-					.map(new Function<String, Long>() {
-						@Override
-						public Long apply(String s) {
-							return Long.parseLong(s);
-						}
-					}).collect(Collectors.toList());
-			//查找在职的管理人员
-			staffManagers = staffService.selectOnJobByIds(mIds);
 
-		}*/
 		if(staffManagers == null || staffManagers.size() == 0){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 			return 4;
@@ -372,18 +361,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 
 			List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
 
-				/*//下面初始化管理人员对应关系
-				for (StaffEntity entity:staffManagers
-				) {
-					EvaluationStartStaff evaluationStartStaff = new EvaluationStartStaff();
-					evaluationStartStaff.setEvaluationId(evaluationGroup.getId());
-					evaluationStartStaff.setEvaluationName(evaluationGroup.getName());
-					evaluationStartStaff.setStaffId(entity.getId());
-					evaluationStartStaff.setStartId(flowStart.getId());
-					evaluationStartStaff.setType(CheckStaffType.MANAGER.getCode());
-					evaluationStartStaffs.add(evaluationStartStaff);
 
-				}*/
 
 
 			//下面初始化参与人员
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 9f372eb1..187511c6 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -541,7 +541,7 @@
 
     <select id="selectStaffsByGroupId" resultType="com.lz.modules.app.entity.StaffEntity">
         select staff.* from (select * from lz_staff where id in (
-            select staff_id from lz_staff_role where is_delete = 0 and (evaluation_group_id = #{sIds} or evaluation_group_id = 0)
+            select staff_id from lz_staff_role where is_delete = 0 and (evaluation_group_id = #{copyId} or evaluation_group_id = 0)
         ) and is_delete=0) as staff join lz_staff_occupation as occupation on staff.id = occupation.staff_id where occupation.staff_status=0
 
     </select>