From 3949fb152bd3c19479de54721d6049976796f2ce Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 15 Jul 2025 13:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=93=81=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ims/SupplierMapper.xml     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml
index 7bfc79f..3f9d991 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml
@@ -55,12 +55,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplierVo">
-        select supplier_id, supplier_code, supplier_name, area_id, address, linkman, linkman_phone, email, opening_bank, bank_account, supplier_simple_name, telephone, company_web, region_province, region_city, region_district, if_receive_notice, notice_style, supplier_user_id, status, wechat, tax_rate, payment_days, standby_linkman, standby_phone, standby_wechat, standby_email, regist_fund, establish_date, workers_num, client_num, last_year_operating_income, before_year_operating_income, business_scope, top_five_client, top_five_supplier, company_introduction, main_advantage, supplier_score, id_card_img_z, id_card_img_f, attachment, remark, del_flag, create_by, create_time, update_by, update_time from ims_supplier
+        select supplier_id, supplier_code, supplier_name, area_id, address, linkman, linkman_phone,
+               email, opening_bank, bank_account, supplier_simple_name, telephone, company_web,
+               region_province, region_city, region_district, if_receive_notice, notice_style,
+               supplier_user_id, status, wechat, tax_rate, payment_days, standby_linkman, standby_phone,
+               standby_wechat, standby_email, regist_fund, establish_date, workers_num, client_num,
+               last_year_operating_income, before_year_operating_income, business_scope, top_five_client,
+               top_five_supplier, company_introduction, main_advantage, supplier_score, id_card_img_z,
+               id_card_img_f, attachment, remark, del_flag, create_by, create_time, update_by, update_time
+        from ims_supplier
     </sql>
 
     <select id="selectSupplierList" parameterType="com.bonus.canteen.core.ims.domain.Supplier" resultMap="SupplierResult">
         <include refid="selectSupplierVo"/>
         <where>
+            del_flag = 0
             <if test="supplierCode != null  and supplierCode != ''"> and supplier_code = #{supplierCode}</if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="areaId != null "> and area_id = #{areaId}</if>
@@ -267,14 +276,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSupplierBySupplierId" parameterType="Long">
-        delete from ims_supplier where supplier_id = #{supplierId}
+        update ims_supplier set del_flag = 2 where supplier_id = #{supplierId}
     </delete>
 
     <delete id="deleteSupplierBySupplierIds" parameterType="String">
-<!--        delete from ims_supplier where supplier_id in-->
-<!--        <foreach item="supplierId" collection="array" open="(" separator="," close=")">-->
-<!--            #{supplierId}-->
-<!--        </foreach>-->
         update ims_supplier set del_flag = 2,supplier_user_id = null  where supplier_id in
         <foreach item="supplierId" collection="array" open="(" separator="," close=")">
             #{supplierId}