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 7d94d1de..e87d35eb 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 @@ -253,7 +253,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),p.getPrincipalId())){ - msg.append(p.getContractName() + "收入合同不可操作!"); + msg.append(p.getContractName() + "数据权限不足!"); } if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1) && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){ 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 7dce3fdb..d6e9fc69 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 @@ -210,7 +210,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = new ArrayList<>(); if(!CollectionUtils.isEmpty(input.getInstallment())){ @@ -276,7 +276,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>(); @@ -298,7 +298,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){ - msg.append(p.getContractName() + "支出合同不可操作!"); + msg.append(p.getContractName() + "数据权限不足!"); } }); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index 30ebd739..82c6f1a3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -177,7 +177,7 @@ from pay_meeting meeting inner join pay_meeting_situation sit on meeting.id = sit.meeting_id - sit.register_check_result != 0 + sit.check_result = 1 AND sit.id = #{projectId} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 90176d61..caf14615 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -167,6 +167,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); @@ -334,7 +334,7 @@ public class PayWorkingGroupSubItemController extends JeroController listContacts = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList()); @@ -497,7 +497,7 @@ public class PayWorkingGroupSubItemController extends JeroController