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 e29f3bd5..77a7479d 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 @@ -873,7 +873,7 @@ public class FlowStartServiceImpl extends ServiceImpl flows, List flowApprovalRoles) { - log.info("员工id :" + resultRecord.getStaffId() + " ,员工名称 " + resultRecord.getStaffName()); + log.info("initFlowRecord 员工id :" + resultRecord.getStaffId() + " ,员工名称 " + resultRecord.getStaffName()); int i = 0; for (FlowApprovalRole flowApprovalRole : flowApprovalRoles) { FlowRecord flowRecord = new FlowRecord(); @@ -830,19 +830,21 @@ public class ResultRecordServiceImpl extends ServiceImpl map = departmentsService.selectUserAllDepartmentIds(relateEntity.getDepartmentId()); - List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); - boolean flag = false; - for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { - String departmentName = map.get(staffRoleDepartment.getDepartmentId()); - if (StringUtil.isNotBlank(departmentName)) { - flag = true; - break; + if(relateEntity !=null ){ + Map map = departmentsService.selectUserAllDepartmentIds(relateEntity.getDepartmentId()); + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + boolean flag = false; + for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { + String departmentName = map.get(staffRoleDepartment.getDepartmentId()); + if (StringUtil.isNotBlank(departmentName)) { + flag = true; + break; + } + } + if (flag) { //如果管理员是管理特定部门 + log.info("如果管理员是管理特定部门==========="); + insertFlowRecord(flowRecord, approvalStaff, flows, flowApprovalRole, resultRecord, i, 1); } - } - if (flag) { //如果管理员是管理特定部门 - log.info("如果管理员是管理特定部门==========="); - insertFlowRecord(flowRecord, approvalStaff, flows, flowApprovalRole, resultRecord, i, 1); } } }