From 43e0624cda7550d3c31ca78dac90dc75b2f6ef7c Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 15:50:36 +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 --- .../sgzb/auth/controller/TokenController.java | 4 ++-- .../app/service/impl/TmTaskServiceImpl.java | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 5f85287c..b2b0e9d9 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -58,9 +58,9 @@ public class TokenController { //web端登录 @PostMapping("login") public R login(@RequestBody LoginBody form) throws Exception { - String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); +// String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { 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 c0895487..dcd09522 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 @@ -442,11 +442,8 @@ public class TmTaskServiceImpl implements TmTaskService { List tmTaskList; if (roles.contains(STRING_ADMIN)) { tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); - } else if (deptId == 101) { - record.setCompanyId(101); - tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); - } else if (deptId == 102) { - record.setCompanyId(102); + } else if (deptId != null) { + record.setCompanyId(deptId.intValue()); tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); } else { String username = SecurityUtils.getLoginUser().getUsername(); @@ -619,12 +616,18 @@ public class TmTaskServiceImpl implements TmTaskService { Set roles = SecurityUtils.getLoginUser().getRoles(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); List tmTaskList = new ArrayList<>(); - if (roles.contains("fgs") && roles.contains("sgb")) { + if (roles.contains("admin")) { + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs") && roles.contains("sgb")) { record.setCompanyId(101); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } else if (roles.contains("fgs")) { + } else if (roles.contains("fgs") && (roles.contains("em01") || roles.contains("em02"))) { //机具书记/副经理内部审批权限 + record.setCompanyId(101); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs")){ record.setDeptId(deptId); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); for (TmTask tmTask : tmTaskList) {