From 87d601c65b453f114c0b4cee5057ca46a864e3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 11 Sep 2024 15:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=A5=97=E5=92=8C=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/bo/SalaryAcctRecordBO.java | 1 + .../salaryacct/dto/SalaryAcctRecordListDTO.java | 3 +++ .../entity/salarysob/dto/SalarySobListDTO.java | 3 ++- .../salary/service/auth/AuthServiceImpl.java | 6 +++--- .../impl/SalaryAcctRecordServiceImpl.java | 17 ----------------- .../impl/SalaryAcctSobConfigServiceImpl.java | 2 +- .../engine/salary/wrapper/SalarySobWrapper.java | 4 ++-- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index fc587cf43..c94b2a079 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -98,6 +98,7 @@ public class SalaryAcctRecordBO { .updateTime(SalaryDateUtil.getFormatLocalDateTime(salaryAcctRecordPO.getUpdateTime())) .description(salaryAcctRecordPO.getDescription()) .operate(btnList) + .opts(salaryAcctRecordPO.getOpts()) .build(); }).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index 7f6aa98f8..89fbad04d 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import java.util.Set; /** * 薪资核算列表 @@ -65,4 +66,6 @@ public class SalaryAcctRecordListDTO { @TableTitle(title = "操作", dataIndex = "operate", key = "operate") private List operate; + + private Set opts; } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java index 885fe0d0a..4d892d643 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java @@ -13,6 +13,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import java.util.Set; /** * 薪资账套列表 @@ -68,5 +69,5 @@ public class SalarySobListDTO { @SalaryTableColumn(text = "操作", width = "20%", column = "operate") @TableTitle(title = "操作", key = "operate", dataIndex = "operate") - private String opts; + private Set opts; } diff --git a/src/com/engine/salary/service/auth/AuthServiceImpl.java b/src/com/engine/salary/service/auth/AuthServiceImpl.java index 9d9d1f09b..df2752c2d 100644 --- a/src/com/engine/salary/service/auth/AuthServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthServiceImpl.java @@ -284,12 +284,12 @@ public class AuthServiceImpl extends Service implements AuthService { //给总管理员赋值最大权限 Boolean isChief = getTaxAgentService(user).isChief(uid); //给各管理员赋值对应的扣缴义务人权限 - Boolean adminEnable = getTaxAgentService(user).isAdminEnable(uid); + Boolean isAdminEnable = getTaxAgentService(user).isAdminEnable(uid); boolean able = false; //如果是管理员，赋值管理权限返回 - if (isChief || adminEnable) { + if (isChief || isAdminEnable) { opts.add("admin"); able = true; } else { @@ -300,7 +300,7 @@ public class AuthServiceImpl extends Service implements AuthService { return Permission.builder() .isOpenDevolution(isOpenDevolution) .isChief(isChief) - .isAdminEnable(adminEnable) + .isAdminEnable(isAdminEnable) .able(able) .opts(opts) .build(); diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 9e8ee21ca..129e660ac 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -192,23 +192,6 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe } po.setSalaryMonths(localDateRange); - -// // 判断是否开启了分权 -// Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); -// if (needAuth) { -// List salarySobPOS = getSalarySobService(user).listByAdmin(); -// List salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId, Collectors.toList()); -// -// if (CollectionUtils.isEmpty(salarySobIds)) { -// return new PageInfo<>(); -// } -// Collection sobIds = po.getSalarySobIds(); -// if (CollectionUtils.isNotEmpty(sobIds)) { -// salarySobIds = (List) SalaryEntityUtil.intersectionForList(salarySobIds, sobIds); -// } -// po.setSalarySobIds(salarySobIds); -// } - // 查询薪资核算记录 List salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po); salaryAcctRecordPOS = getAuthService(user).auth(salaryAcctRecordPOS, AuthFilterTypeEnum.DATA_OPT, SalaryAcctRecordPO.class); diff --git a/src/com/engine/salary/service/impl/SalaryAcctSobConfigServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctSobConfigServiceImpl.java index 085abe60e..a8ebe8b94 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctSobConfigServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctSobConfigServiceImpl.java @@ -163,7 +163,7 @@ public class SalaryAcctSobConfigServiceImpl extends Service implements SalaryAcc } @Override - public void save(SalaryAcctSobConfigPO salaryAcctSobConfig) { + public synchronized void save(SalaryAcctSobConfigPO salaryAcctSobConfig) { deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctSobConfig.getSalaryAcctRecordId())); getSalaryAcctSobConfigMapper().insertIgnoreNull(salaryAcctSobConfig); String cacheIndex = salaryAcctSobConfig.getSalaryAcctRecordId().toString(); diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index f34eb171a..97a016cfe 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -88,7 +88,7 @@ public class SalarySobWrapper extends Service { List taxAgentPOS = getTaxAgentService(user).listAll(); - List salarySobListDTOS = page.getList().stream() + List salarySobListDTOS = page.getList().stream() .map(salarySobPO -> { List taxAgentIds = salarySobPO.getTaxAgentIds(); String taxAgentName = taxAgentPOS.stream().filter(po -> taxAgentIds.contains(po.getId())).map(TaxAgentPO::getName).collect(Collectors.joining(",")); @@ -100,7 +100,7 @@ public class SalarySobWrapper extends Service { .salaryCycle(SalarySobBO.buildSalaryCycle(salarySobPO)) .disable(salarySobPO.getDisable()) .description(salarySobPO.getDescription()) -// .opts(salarySobPO.getOpts()) + .opts(salarySobPO.getOpts()) .build(); })