diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index fd121ef2..e6b91b42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -98,6 +98,10 @@ public class PaySpendingContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = paySpendingContractService.queryPageList(page, paySpendingContract,startTime,endTime); return Result.OK(pageList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index e6aea71e..3428d279 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -251,10 +251,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ - if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){ - if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){ - msg.append("收入合同不可操作!"); - } + if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),p.getPrincipalId())){ + msg.append(p.getContractName() + "收入合同不可操作!"); } if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1) && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){ - msg1.append("收入合同不可删除!"); + msg1.append(p.getContractName() + "收入合同不可删除!"); } }); if(!StringUtils.isEmpty(msg)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index ee5395dd..c421eff5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -159,6 +159,10 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = new ArrayList<>(); if(!CollectionUtils.isEmpty(input.getInstallment())){ listPaySpendingContractInstallment = input.getInstallment(); @@ -221,10 +225,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>(); @@ -241,6 +243,20 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ + if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){ + msg.append(p.getContractName() + "支出合同不可操作!"); + } + }); + } + + if(!StringUtils.isEmpty(msg)){ + throw new JeroBootException(msg.toString()); + } + paySpendingContractService.removeByIds(ids); LambdaUpdateWrapper updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>(); updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids);