From cc4c7396c9da780743b37013b429763fc02e39f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 7 Sep 2021 14:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/pay.pdm                                       | 16 ++++++++--------
 .../impl/PayIncomeContractServiceImpl.java       |  2 +-
 .../controller/PayWorkingGroupController.java    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{8176B8FB-6F24-438A-BA14-B7A4B81519C0}" Label="" LastModificationDate="1630982726" Name="pay" Objects="742" Symbols="43" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{8176B8FB-6F24-438A-BA14-B7A4B81519C0}" Label="" LastModificationDate="1630993658" Name="pay" Objects="742" Symbols="43" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -7902,9 +7902,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o77">
 <a:CreationDate>1630635062</a:CreationDate>
-<a:ModificationDate>1630635062</a:ModificationDate>
+<a:ModificationDate>1630993658</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-47379,-3229), (-9967,4795))</a:Rect>
+<a:Rect>((-47254,-2966), (-5592,5882))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -14232,8 +14232,8 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>pay_income_contract_associated</a:Code>
 <a:CreationDate>1629706930</a:CreationDate>
 <a:Creator>lilili</a:Creator>
-<a:ModificationDate>1630635062</a:ModificationDate>
-<a:Modifier>lilili</a:Modifier>
+<a:ModificationDate>1630993655</a:ModificationDate>
+<a:Modifier>LQT</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o545">
@@ -14272,12 +14272,12 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o548">
 <a:ObjectID>29654BA7-486E-42C3-AE64-D5A51CCDF93D</a:ObjectID>
-<a:Name>项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目）</a:Name>
+<a:Name>项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）</a:Name>
 <a:Code>project_type</a:Code>
 <a:CreationDate>1629770667</a:CreationDate>
 <a:Creator>lilili</a:Creator>
-<a:ModificationDate>1630635062</a:ModificationDate>
-<a:Modifier>lilili</a:Modifier>
+<a:ModificationDate>1630993655</a:ModificationDate>
+<a:Modifier>LQT</a:Modifier>
 <a:DataType>tinyint(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
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<PayIncomeContractM
             throw new JeroBootException("关联id不能为空！");
         }
         PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(input.getId());
-        if(Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
+        if(!Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
             throw new JeroBootException("关联id不能为空！");
         }
         if(Objects.isNull(payIncomeContractAssociated)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 1409aee1..968325a1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -115,7 +115,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			return Result.error("企业id不能为空！");
 		}
 		List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
-		if(CollectionUtils.isEmpty(list)){
+		if(!CollectionUtils.isEmpty(list)){
 			setPayWorkingGroupSubItem(list);
 		}
 		return Result.OK(list);