From 1bc34bee11cb35136f221854fe49d3595b84544f Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Mon, 17 Jul 2023 14:23:59 +0800 Subject: [PATCH] update --- .../workFlow/engine/service/impl/BudgetWorkFlowService.java | 6 +++--- .../engine/service/impl/FumigationWorkFlowService.java | 4 ++-- .../workFlow/engine/service/impl/LeaveWorkFlowService.java | 6 +++--- .../workFlow/engine/service/impl/RepairWorkFlowService.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/BudgetWorkFlowService.java b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/BudgetWorkFlowService.java index 5d1d461..dd28d9b 100644 --- a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/BudgetWorkFlowService.java +++ b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/BudgetWorkFlowService.java @@ -83,7 +83,7 @@ public class BudgetWorkFlowService implements IWorkFlowType { // 2.通知部门或库点负责人账号 Role role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "部门负责人") + .eq(Role::getName, "部门负责人") .last("limit 1")); String type = JSONUtil.parseObj(workFlow.getData()).getStr("type"); List nextUserList = userService.list(new QueryWrapper().lambda() @@ -108,7 +108,7 @@ public class BudgetWorkFlowService implements IWorkFlowType { } if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "库点负责人") + .eq(Role::getName, "库点负责人") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .eq(User::getDept, user.getDept()) @@ -117,7 +117,7 @@ public class BudgetWorkFlowService implements IWorkFlowType { } if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "总经理") + .eq(Role::getName, "总经理") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .like(User::getRoles, role.getId()) diff --git a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/FumigationWorkFlowService.java b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/FumigationWorkFlowService.java index e3b777c..803d006 100644 --- a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/FumigationWorkFlowService.java +++ b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/FumigationWorkFlowService.java @@ -70,8 +70,8 @@ public class FumigationWorkFlowService implements IWorkFlowType { User user = userService.getById(workFlow.getUserId()); List roles = roleService.listByIds(Arrays.asList(user.getRoles().split(","))); List roleNames = roles.stream().map(Role::getName).collect(Collectors.toList()); - if (!roleNames.contains("库管员")) { - throw new ResultException("您不是库管员，无法发起流程"); + if (!roleNames.contains("保管员")) { + throw new ResultException("您不是保管员，无法发起流程"); } // 1.流程step+1 diff --git a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/LeaveWorkFlowService.java b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/LeaveWorkFlowService.java index 78f4c31..2750de0 100644 --- a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/LeaveWorkFlowService.java +++ b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/LeaveWorkFlowService.java @@ -75,7 +75,7 @@ public class LeaveWorkFlowService implements IWorkFlowType { // 2.找到部门或库点负责人审批 Role role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "部门负责人") + .eq(Role::getName, "部门负责人") .last("limit 1")); List nextUserList = userService.list(new QueryWrapper().lambda() .eq(User::getDept, user.getDept()) @@ -83,7 +83,7 @@ public class LeaveWorkFlowService implements IWorkFlowType { ); if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "库点负责人") + .eq(Role::getName, "库点负责人") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .eq(User::getDept, user.getDept()) @@ -92,7 +92,7 @@ public class LeaveWorkFlowService implements IWorkFlowType { } if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "总经理") + .eq(Role::getName, "总经理") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .like(User::getRoles, role.getId()) diff --git a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/RepairWorkFlowService.java b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/RepairWorkFlowService.java index 04e386d..faaee29 100644 --- a/src/main/java/com/ydool/oa/workFlow/engine/service/impl/RepairWorkFlowService.java +++ b/src/main/java/com/ydool/oa/workFlow/engine/service/impl/RepairWorkFlowService.java @@ -84,7 +84,7 @@ public class RepairWorkFlowService implements IWorkFlowType { // 2.找到部门或库点负责人审批 Role role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "部门负责人") + .eq(Role::getName, "部门负责人") .last("limit 1")); List nextUserList = userService.list(new QueryWrapper().lambda() .eq(User::getDept, user.getDept()) @@ -92,7 +92,7 @@ public class RepairWorkFlowService implements IWorkFlowType { ); if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "库点负责人") + .eq(Role::getName, "库点负责人") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .eq(User::getDept, user.getDept()) @@ -101,7 +101,7 @@ public class RepairWorkFlowService implements IWorkFlowType { } if (CollUtil.isEmpty(nextUserList)) { role = roleService.getOne(new QueryWrapper().lambda() - .eq(Role::getCode, "总经理") + .eq(Role::getName, "总经理") .last("limit 1")); nextUserList = userService.list(new QueryWrapper().lambda() .like(User::getRoles, role.getId())