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 { StaffSimpleInfo selectStaffSimpleInfo(@Param("staffId") Long staffId); List selectNamesByIds(@Param("list") List sIds); + + List 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 { StaffSimpleInfo selectStaffSimpleInfo(Long staffId); List selectNamesByIds(List sIds); + //获取绩效考核管理员 + List 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 impleme return staffDao.selectNamesByIds(sIds); } + @Override + public List 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> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系,减少数据库查找 //下面开始初始化流程 List ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function() { @@ -250,8 +249,9 @@ public class FlowStartServiceImpl extends ServiceImpl chartNameMaps = flowCharts.stream().collect(Collectors.toMap(FlowChart::getId, FlowChart::getName));//流程节点与流程名称对应map,下面多次循环,减少数据库查找 - List staffManagers = null; - if(!StringUtil.isEmpty(evaluationGroup.getManagerIds())){ + //获取绩效考核管理员 + List staffManagers = staffService.selectStaffsByGroupId(evaluationGroup.getCopyId()); + /*if(!StringUtil.isEmpty(evaluationGroup.getManagerIds())){ List mIds = Arrays.stream(evaluationGroup.getManagerIds().split(",")) .map(new Function() { @Override @@ -262,7 +262,7 @@ public class FlowStartServiceImpl extends ServiceImpl ) + +