Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4

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
 

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());
                 }

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")