From d56ac1f81b47263a7e345a307253ced5c2da676c Mon Sep 17 00:00:00 2001 From: dengyu Date: Thu, 14 Sep 2023 15:52:12 +0800 Subject: [PATCH] 1 --- DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs index 6adc589d..5ff92e47 100644 --- a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs @@ -1016,13 +1016,10 @@ namespace DSWeb.Areas.CommMng.DAL //var cdc = new CommonDataContext(); //var currHead = cdc.ch_fee_payapplication.First(x => x.BILLNO == headdata.BILLNO); -<<<<<<< HEAD + var currHead = ChpayapplicationDAL.GetData_All($" cm.billno={headdata.BILLNO}"); if (!string.IsNullOrWhiteSpace(currHead.PAYAPPID)) -======= - if (!string.IsNullOrWhiteSpace(headdata.PAYAPPID)) ->>>>>>> 2802808cb4c2b91876b8aeec69145b2523b04efc { result.SetErrorInfo("业务已经提交至泛微OA"); 泛微OAHelper.BILLDONE(headdata.BILLNO);