From c9cee68261b93f084da05b1993b1b5440ae45b09 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 3 Nov 2020 13:45:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E4=BF=9D=E5=AD=98=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=98=AF=E7=9A=84=E5=BF=85=E5=A4=87=E6=9D=83=E9=99=90=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E5=8F=91=E8=B5=B7=E8=80=83=E6=A0=B8=E6=97=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 a69cb6e9..0cfd1966 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 @@ -129,13 +129,15 @@ public class FlowStartServiceImpl extends ServiceImpl> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系,减少数据库查找 + Map> mustRole = new HashMap<>(); + Map> selfMustRole = new HashMap<>(); for (GroupStaffs groupStaffs:startGroupStaffIds.getGroups() ) { List staffSimpleInfos = staffService.selectStaffSimpleInfos(groupStaffs.getStaffIds()); if(staffSimpleInfos.size() == 0){ R.error(groupStaffs.getEvaluationGroup().getName() + "——无有效考核人员"); } - switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos)){ + switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole)){ case 1: return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置考核模板");