From 1759ecd7eac3b140a988b85c89c3649e189a0fb4 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Sat, 30 Nov 2024 16:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dingtalk/service/impl/DingU8cBillServiceImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
index 00ce59d5..114a9532 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/service/impl/DingU8cBillServiceImpl.java
@@ -73,6 +73,15 @@ public class DingU8cBillServiceImpl extends BaseService<DingU8cBillEntity, Strin
 			entity.setStart_time(entity.getStart_time()+" 00:00:00");
 			entity.setEnd_time(entity.getEnd_time()+" 23:59:58");
 		}
+		if("Y,N".equals(entity.getPush_status())||"N,Y".equals(entity.getPush_status())){//"Y,N"
+			entity.setPush_status(null);
+		}
+		if("Y,N".equals(entity.getApprove())||"N,Y".equals(entity.getApprove())){//"Y,N"
+			entity.setApprove(null);
+		}
+		if("U,D".equals(entity.getInitiate())||"D,U".equals(entity.getInitiate())){//"Y,N"
+			entity.setInitiate(null);
+		}
 		List<DingU8cBillEntity> dingU8cBillEntityList = super.query(entity);
 		return dingU8cBillEntityList;
 	}
@@ -149,7 +158,7 @@ public class DingU8cBillServiceImpl extends BaseService<DingU8cBillEntity, Strin
 			String u8cBillCode = dingU8cBillEntityNew.getU8c_bill_code();
 			ArapDjzbEntity arapDjzbEntity = queryArapDjzbEntity(u8cPkCorp, u8cBillCode);
 			if(arapDjzbEntity==null){
-				return null;
+				Assert.state(false,"根据公司编码：{}，单据号：{}，未查询到U8C单据，请检查。");
 			}