From 46dc3742677db24b4a758e8520eb2e4b9db4064e Mon Sep 17 00:00:00 2001
From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com>
Date: Wed, 4 Sep 2024 18:03:36 +0800
Subject: [PATCH] bug

---
 .../service/approver/impl/CancellaApproverServiceImpl.java   | 4 ++--
 .../business/service/impl/PsContractInfoServiceImpl.java     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java
index 6fe1a34..e82f35b 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java
@@ -61,8 +61,8 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl {
                 .eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode()));
         //审批删除
         if(CollectionUtils.isNotEmpty(list)){
-            List<Long> ids = list.stream().map(PsTaskMain::getId).toList();
-            if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).toList());}
+            List<String> ids = new java.util.ArrayList<>(list.stream().map(PsTaskMain::getId).map(Object::toString).toList());
+            if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).map(Object::toString).toList());}
             baseMapper.update(Wrappers.<PsApproverRecord>lambdaUpdate().set(PsApproverRecord::getDelFlag, "2")
                     .in(PsApproverRecord::getBusinessId,ids));
         }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
index ae5c635..15b8c63 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
@@ -321,11 +321,14 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
         info.setContractCode(contractCode);
         //查询合同详细信息
         PsContractInfoVo infoVo = this.queryContractByCode(contractCode);
+        if(StringUtils.equals(CustomerStatusEnum.STOP.getCode(),infoVo.getPsCustomInfoVo().getCustomStatus())){
+            throw new ServiceException("操作失败，客户已终止合作");
+        }
+
         //没有任何一笔收款：点击【作废】，直接作废合同
         if(CollectionUtils.isEmpty(infoVo.getContractPayVoList())){
             info.setIsCancel(CommonStatusEnum.SUCCESS.getCode());
         }else{
-
             if(StringUtils.isBlank(desc)){throw new ServiceException("请填写作废原因");}
             //有收款：点击【作废】填写【作废原因】后发起【作废】审批
             ApproverService service = container.getService(ApproverTypeEnum.CANCELLA.getCode());