From dfecee8de21c31c3c0c28ea1acebfacb0adeef12 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 23 Jan 2024 08:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=AF=E6=8C=81supplierFla?=
 =?UTF-8?q?g=3D2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/tbs/controller/TbsCostApplyController.java | 2 +-
 .../serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
index 73fd974f..45668b6c 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
@@ -300,7 +300,7 @@ public class TbsCostApplyController {
 
         }
         boolean contract = entity.getContractFlag()!=null&&entity.getContractFlag().equals(1);
-        if(contract&&!supplier.getSupplierFlag().equals(1)){
+        if(contract&&!(supplier.getSupplierFlag().equals(1)||supplier.getSupplierFlag().equals(2))){
             return R.error("当前用户非供应商");
         }
         entity.setMatchType(1);
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index 37d47f08..fd069518 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -412,7 +412,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             }else {
                 Long supplierId = activityList.get(0).getSupplierId();
                 BmsSupplier supplier = bmsSupplierService.getById(supplierId);
-                if(!supplier.getSupplierFlag().equals(1)){
+                if(!supplier.getSupplierFlag().equals(1)&&!supplier.getSupplierFlag().equals(2)){
                     Assert.throwEx("协议类申请只对供应商开放");
                 }
                 BigDecimal total = activityList.get(0).getTotalAmount();