From e547366f45dadddebc15a9d18417c23c6ba1a008 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Fri, 31 May 2024 14:48:04 +0800 Subject: [PATCH 1/5] =?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 --- .../service/impl/BackApplyServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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..80a1d8fc 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.equals(101)) { + record.setStatus("1"); + backApplyMapper.audit(record); + } + if (companyId != null && companyId.equals(102)) { record.setStatus("3"); backApplyMapper.audit(record); } @@ -172,12 +176,17 @@ public class BackApplyServiceImpl implements BackApplyService { int num = 0; Set roles = SecurityUtils.getLoginUser().getRoles(); Long userid = SecurityUtils.getLoginUser().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.equals(101)) { + record.setStatus("2"); + return backApplyMapper.refuse(record); + } + if (companyId != null && companyId.equals(101)) { record.setStatus("4"); return backApplyMapper.refuse(record); } From 16dc57e902c7cbf97fac9a9cbca1e323a2d035bc Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Fri, 31 May 2024 15:04:51 +0800 Subject: [PATCH 2/5] =?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/system/service/impl/SysUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index 9871bc28..3b3a3108 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -262,6 +262,9 @@ public class SysUserServiceImpl implements ISysUserService { user.setCompanyId(dept.getDeptId()); } }*/ + if (deptId == 100){ + user.setCompanyId(deptId); + } if (split.length == 2) { //表示属于分公司 user.setCompanyId(sysDept.getDeptId()); From d1c863887607dd61ef70473d9ef979d94a04d39e Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Fri, 31 May 2024 15:19:44 +0800 Subject: [PATCH 3/5] =?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/system/service/impl/SysUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index 3b3a3108..63e1bd9e 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -316,6 +316,9 @@ public class SysUserServiceImpl implements ISysUserService { SysDept sysDept = deptMapper.selectDeptById(deptId); String ancestors = sysDept.getAncestors(); String[] split = ancestors.split(","); + if (deptId == 100){ + user.setCompanyId(deptId); + } if (split.length == 2) { //表示属于分公司 user.setCompanyId(sysDept.getDeptId()); From df24e8cb712b9bd5953a369885b0b6e66bed5b1a Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 31 May 2024 16:32:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index 1caf7644..eef4cc5b 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -451,6 +451,8 @@ export default { taskId: row.taskId, isEdit: false, }, + }).then(() => { + this.$tab.refreshPage() }) }, /** 修改按钮操作 */ From 403661be05aad044aa5fe734821283d45f5d7576 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Fri, 31 May 2024 23:38:35 +0800 Subject: [PATCH 5/5] =?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 --- .../bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.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/LeaseUserBookServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java index f022e147..7b7b9a77 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java @@ -25,7 +25,7 @@ public class LeaseUserBookServiceImpl implements LeaseUserBookService { @Override public int add(LeaseUserBook bean) { - Long userId = SecurityUtils.getLoginUser().getUserid(); + Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId(); bean.setUserId(userId); return mapper.add(bean); }