From 4617de97894d27643e8b80caea234b20f0493006 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 29 May 2024 17:26:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/auth/controller/TokenController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 14899b7b..5f85287c 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(), form.getPassword()); + LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { From 2ed82325b9d86dbc7ca09fc7e908b4c6bec8ab0b Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Wed, 29 May 2024 19:34:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 97695723..d4f5fe9c 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 @@ -625,7 +625,7 @@ public class TmTaskServiceImpl implements TmTaskService { List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); if (collect.size() > 0) { int deptId1 = tmTaskMapper.getDeptId(collect.get(0).getCreateBy()); - if (roles.contains("admin")) { + if (roles.contains("admin") || deptId == 100) { // 对领料任务集合查询具体详情 for (LeaseApplyInfo leaseApplyInfo : collect) { if (leaseApplyInfo != null) { From 66fc5505eb9ae7c20d5548a2aca3464780495773 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Thu, 30 May 2024 09:52:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 d4f5fe9c..8315dc3a 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 @@ -619,7 +619,6 @@ public class TmTaskServiceImpl implements TmTaskService { for (TmTask tmTask : tmTaskList) { int count = 0; - tmTask.setDeptId(deptId); if (tmTask != null) { // 去查询任务分单表 List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); @@ -642,6 +641,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); // 存入领料任务实体集合 tmTask.setLeaseApplyInfoList(collect); + tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1))); tmTask.setRemark(collect.get(0).getRemark()); } } @@ -670,6 +670,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); // 存入领料任务实体集合 tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1))); tmTask.setRemark(collect.get(0).getRemark()); } } @@ -699,6 +700,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); // 存入领料任务实体集合 tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1))); tmTask.setRemark(collect.get(0).getRemark()); } } @@ -721,6 +723,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); // 存入领料任务实体集合 tmTask.setLeaseApplyInfoList(collect); + tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1))); tmTask.setRemark(collect.get(0).getRemark()); } } @@ -749,6 +752,7 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); // 存入领料任务实体集合 tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1))); tmTask.setRemark(collect.get(0).getRemark()); } }