From feab351a4fa59ad79ce80aed54ebdd5300d43f3e Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 8 Jul 2024 16:34:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/TmTaskServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 33f33490..a33d8d14 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -81,10 +81,14 @@ public class TmTaskServiceImpl implements TmTaskService { private RemoteUserService remoteUserService; private final static String STRING_ADMIN = "admin"; - private final static String STRING_SGB = "sgb"; - private final static String STRING_AJB = "sgb"; private final static String STRING_JJFGS = "jjfgs"; private final static String STRING_TSFGS = "tsfgs"; + private final static String STRING_JJBZ = "jjbz"; + private final static String STRING_FBZ = "fbz"; + private final static String STRING_EM01 = "em01"; + private final static String STRING_EM02 = "em02"; + private final static String STRING_EM03 = "em03"; + private final static String STRING_DM01 = "dm01"; /** * 领料任务审核状态 @@ -652,14 +656,14 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseOutListByUser(TmTask task) { Set roles = SecurityUtils.getLoginUser().getRoles(); - Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); - if (roles.contains("admin")) { + if (roles.contains(STRING_ADMIN)) { return tmTaskMapper.getLeaseOutListByAdmin(task); - } else if (roles.contains("jjbz") || roles.contains("fbz") || deptId == 101) { - //机具班长、副班长、机具分公司可以查看机具设备 + } else if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ) || roles.contains(STRING_EM01) + || roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) { + //机具班长、副班长、机具经理、机具副经理、安全员可以查看机具设备 return tmTaskMapper.getLeaseOutListByjjbz(task); - } else if (deptId == 102) { - //调试分公司可以查看调试设备 + } else if (roles.contains(STRING_DM01)) { + //调试经理可以查看调试设备 return tmTaskMapper.getLeaseOutListByts(task); } else { return tmTaskMapper.getLeaseOutListByUser(task);