From 931f357a40f30bd6cc70093c676a810bfbb38d35 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 09:44:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=A0=87=E5=8D=8F=E9=A1=B9=E7=9B=AE=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java  | 2 +-
 .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 925c38b2..f4af39bf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -378,7 +378,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                     throw new JeroBootException("标协会议类型不存在");
                 }
                 payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType));
-                if (oldMeeting == null){
+                if (StringUtils.isBlank(payMeetingVO.getStandardsId())){
                     TbMemberProject memberProject = getTbMemberProject();
                     payMeeting.setStandardsId(memberProject.getId());
                 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index c9927abb..5f902485 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -78,6 +78,10 @@ public class PayMeetingVO implements Serializable {
     @ApiModelProperty(value = "分标委项目名称")
     private String caseCommitteeName;
 
+    /**标协项目id*/
+    @ApiModelProperty(value = "标协项目id")
+    private String standardsId;
+
 
     /**理事会项目id*/
     @ApiModelProperty(value = "理事会项目id")

From 3f37e7d8f8eba94e90d18757732aa7befb681a19 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 11:31:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/controller/PayMeetingController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index cc448641..085995d3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -502,7 +502,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         //先判断非成员
         if (!isSubItem){
             //会议金额等于0并且是工作组会议（工作组会议金额为0时可以下载）
-            if (!(meetingCosts.compareTo(BigDecimal.ZERO) == 0 && meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT))){
+            if (meetingCosts.compareTo(BigDecimal.ZERO) == 0 && meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){
 
             }else