diff --git a/db/pay.pdm b/db/pay.pdm index af6bcd2a..70e3cc2f 100644 --- a/db/pay.pdm +++ b/db/pay.pdm @@ -1,5 +1,5 @@ - + @@ -7902,9 +7902,9 @@ LABL 0 新宋体,8,N 1630635062 -1630635062 +1630993658 -1 -((-47379,-3229), (-9967,4795)) +((-47254,-2966), (-5592,5882)) 12615680 16570034 12632256 @@ -14232,8 +14232,8 @@ LABL 0 新宋体,8,N pay_income_contract_associated 1629706930 lilili -1630635062 -lilili +1630993655 +LQT @@ -14272,12 +14272,12 @@ LABL 0 新宋体,8,N 29654BA7-486E-42C3-AE64-D5A51CCDF93D -项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目) +项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) project_type 1629770667 lilili -1630635062 -lilili +1630993655 +LQT tinyint(1) 1 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 ce867cbc..7e369b1f 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 @@ -374,7 +374,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2); - if(CollectionUtils.isEmpty(list)){ + if(!CollectionUtils.isEmpty(list)){ setPayWorkingGroupSubItem(list); } return Result.OK(list);