From 7690b80b6b3d8b79c6b5d01d35d73f5e972bdfc9 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Fri, 31 May 2024 15:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BackApplyServiceImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 796c78fe..2849a578 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -141,14 +141,18 @@ public class BackApplyServiceImpl implements BackApplyService { public int audit(BackApplyInfo record) { int num = 0; Set roles = SecurityUtils.getLoginUser().getRoles(); - String username = SecurityUtils.getLoginUser().getUsername(); + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); String userId = String.valueOf(SecurityUtils.getLoginUser().getUserid()); record.setCreateBy(userId); - if (roles.contains("jjfgs") || roles.contains("admin")) { + if (roles.contains("admin")) { record.setStatus("1"); backApplyMapper.audit(record); } - if (roles.contains("tsfgs") || roles.contains("admin")) { + if (companyId != null && companyId == 101) { + record.setStatus("1"); + backApplyMapper.audit(record); + } + if (companyId != null && companyId == 102) { record.setStatus("3"); backApplyMapper.audit(record); } @@ -171,13 +175,18 @@ public class BackApplyServiceImpl implements BackApplyService { public int refuse(BackApplyInfo record) { int num = 0; Set roles = SecurityUtils.getLoginUser().getRoles(); - Long userid = SecurityUtils.getLoginUser().getUserid(); + Long userid = SecurityUtils.getLoginUser().getSysUser().getUserId(); + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); record.setCreateBy(userid.toString()); - if (roles.contains("jjfgs") || roles.contains("admin")) { + if(roles.contains("admin")){ record.setStatus("2"); return backApplyMapper.refuse(record); } - if (roles.contains("tsfgs") || roles.contains("admin")) { + if (companyId != null && companyId == 101) { + record.setStatus("2"); + return backApplyMapper.refuse(record); + } + if (companyId != null && companyId == 102) { record.setStatus("4"); return backApplyMapper.refuse(record); }