From 7ce7b3885f670332b1c2ce21d59a1669203aebf6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 2 Jul 2025 13:19:51 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisTmsCostProfitMapper.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
index 8283994a3..053e04d15 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.bill_code=b.bill_code and a.del_flag='0' and  b.del_flag='0'
             <if test="id != null "> and b.id = #{id}</if>
-            <if test="billCode != null  and billCode != ''">  and FIND_IN_SET(b.`bill_code`,#{billCode})</if>
+            <if test="billCode != null  and billCode != ''">  and ( FIND_IN_SET(b.`bill_code`,#{billCode}) or FIND_IN_SET(b.`master_bill_code`,#{billCode}) )</if>
             <if test="standardFee != null "> and b.standard_fee = #{standardFee}</if>
             <if test="billFee != null "> and b.bill_fee = #{billFee}</if>
             <if test="costFee != null "> and b.cost_fee = #{costFee}</if>
@@ -228,11 +228,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmisTmsCostProfitById" parameterType="Long">
-        delete from emis_tms_cost_profit where id = #{id}
+        update emis_tms_cost_profit set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisTmsCostProfitByIds" parameterType="String">
-        delete from emis_tms_cost_profit where id in 
+        update emis_tms_cost_profit set del_flag='1'  where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>