From c88eb0a9b37bc2a6759b1d64d7f6bbda21d9f227 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 30 Oct 2020 11:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=BB=A9=E6=95=88=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E7=BB=A9=E6=95=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lz/modules/app/dao/StaffDao.java        | 2 ++
 .../java/com/lz/modules/app/service/StaffService.java     | 2 ++
 .../com/lz/modules/app/service/impl/StaffServiceImpl.java | 5 +++++
 .../modules/flow/service/impl/FlowStartServiceImpl.java   | 8 ++++----
 src/main/resources/mapper/generator/StaffDao.xml          | 7 +++++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java
index 2a058a2b..70f7b8c8 100644
--- a/src/main/java/com/lz/modules/app/dao/StaffDao.java
+++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java
@@ -96,4 +96,6 @@ public interface StaffDao extends BaseMapper<StaffEntity> {
     StaffSimpleInfo selectStaffSimpleInfo(@Param("staffId") Long staffId);
 
     List<StaffEntity> selectNamesByIds(@Param("list") List<Long> sIds);
+
+    List<StaffEntity> selectStaffsByGroupId(@Param("copyId") Long copyId);
 }
diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java
index 577094c1..dad4c18f 100644
--- a/src/main/java/com/lz/modules/app/service/StaffService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffService.java
@@ -101,5 +101,7 @@ public interface StaffService extends IService<StaffEntity> {
     StaffSimpleInfo selectStaffSimpleInfo(Long staffId);
 
     List<StaffEntity> selectNamesByIds(List<Long> sIds);
+    //获取绩效考核管理员
+    List<StaffEntity> selectStaffsByGroupId(Long copyId);
 }
 
diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
index daa4731b..d2a37b33 100644
--- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
@@ -524,5 +524,10 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
         return staffDao.selectNamesByIds(sIds);
     }
 
+    @Override
+    public List<StaffEntity> selectStaffsByGroupId(Long copyId){
+        return staffDao.selectStaffsByGroupId(copyId);
+    }
+
 
 }
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 03176ce6..5f28a574 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
@@ -181,7 +181,6 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		}
 
 
-
 		Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找
 		//下面开始初始化流程
 		List<Long> ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, Long>() {
@@ -250,8 +249,9 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		Map<Long, String> chartNameMaps =
 				flowCharts.stream().collect(Collectors.toMap(FlowChart::getId, FlowChart::getName));//流程节点与流程名称对应map，下面多次循环，减少数据库查找
 
-		List<StaffEntity> staffManagers = null;
-		if(!StringUtil.isEmpty(evaluationGroup.getManagerIds())){
+		//获取绩效考核管理员
+		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
@@ -262,7 +262,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			//查找在职的管理人员
 			staffManagers = staffService.selectOnJobByIds(mIds);
 
-		}
+		}*/
 		if(staffManagers == null || staffManagers.size() == 0){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 			return 4;
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index ac699274..9f372eb1 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -538,4 +538,11 @@
             </foreach>
         )
     </select>
+
+    <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)
+        ) and is_delete=0) as staff join lz_staff_occupation as occupation on staff.id = occupation.staff_id where occupation.staff_status=0
+
+    </select>
 </mapper>