From 26258827b2f1a3fdefb79f63931a486a64e98f95 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 3 Jul 2024 17:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=88=9B=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=E9=87=91=E9=A2=9D=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java | 6 ++++--
 .../main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java   | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java
index 5edaec3..3b8c783 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/PurchaseServiceImpl.java
@@ -64,8 +64,6 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                 .ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin())
                 .eq(req.getStatus() != null, Purchase::getXcfhxApplyStatus, req.getStatus())
                 .eq(req.getSourceType() != null,Purchase::getSourceType,req.getSourceType())
-                .ge(Objects.nonNull(req.getAmountStart()),Purchase::getTransactionAmount,req.getAmountStart())
-                .le(Objects.nonNull(req.getAmountEnd()),Purchase::getTransactionAmount,req.getAmountEnd())
                 .orderByDesc(Purchase::getCreateOn);
 
         if (Boolean.TRUE.equals(req.getFinished())) {
@@ -114,6 +112,10 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                                 return null;
                             }
                             item.setContractAmount(contract.getTotalAmount());
+                        }else{
+                            if(Objects.nonNull(req.getAmountStart()) || Objects.nonNull(req.getAmountEnd())){
+                                return null;
+                            }
                         }
                         return item;
                     }).collect(Collectors.toList());
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java
index f6d1d11..68425f7 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java
@@ -15,6 +15,7 @@ import com.hz.pm.api.todocenter.constant.TodoCenterConst;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
+import com.ningdatech.basic.function.VUtils;
 import com.wflow.contants.HisProInsEndActId;
 import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO;
 import com.wflow.workflow.bean.process.ProgressNode;
@@ -350,6 +351,9 @@ public class WithDrawHandle {
                 .select(XinchuangInst::getInstType)
                 .eq(XinchuangInst::getInstCode, instance.getId());
         XinchuangInst xinchuangInst = xinchuangInstService.getOne(piQuery);
+        if(Objects.isNull(xinchuangInst)) {
+            return Boolean.FALSE;
+        }
         Integer instType = xinchuangInst.getInstType();
 
         if (InstTypeEnum.APPLY_DELAY.eq(instType) || InstTypeEnum.APPLY_BORROW.eq(instType) ||