From 9037cb86e8b503749d01c8e70c46a61d5af071ac Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 3 Jul 2024 23:15:35 +0800
Subject: [PATCH] md

---
 emis-biz/src/main/resources/mapper/EmisBaseMapper.xml           | 2 +-
 .../src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index 199e90dd9..61c061508 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -136,7 +136,7 @@
 
     <!--  查询运单调整类型 -->
     <select id="selectAjustTypeNameByCode" parameterType="string" resultType="string">
-        select a.type_name from emis_waybill_ajust_type a where a.type_code = #{typeCode} limit 1
+        select group_concat(a.type_name) as type_name from emis_waybill_ajust_type a where  a.del_flag='0' and FIND_IN_SET(a.type_code, #{typeCode}) limit 1
     </select>
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index d250c3086..e95f715d9 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper">
 
-    <resultMap type="EmisWaybillAjustApply" id="BaseEmisWaybillAjustApplyResult"  extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisWaybillAjustApply" id="BaseEmisWaybilapplyTypeNamelAjustApplyResult"  extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="applyType"    column="apply_type"    />