From 5bfc7529506442b99896bca58ae238d54f61e039 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 22 Sep 2021 18:52:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingSituationController.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index e0a0d621..874ca1b8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -3,10 +3,12 @@ package com.jero.meeting.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
@@ -30,6 +32,7 @@ import com.jero.meeting.vo.excel.*;
 import com.jero.project.common.PayProjectCommon;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
@@ -75,8 +78,10 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         for (PayMeetingSituation meetingSituation : situationList) {
             Integer payMode = meetingSituation.getPayMode();
             //汇款并且缴费凭证为空
-            if (payMode.equals(1)&& StringUtils.isBlank(meetingSituation.getPaymentRecord())){
+            if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){
                 meetingSituation.setIdentification(PayProjectCommon.YES);
+            }else {
+                meetingSituation.setIdentification(PayProjectCommon.NO);
             }
         }
         return Result.OK(pageList);