From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
index 7e07b10..0fc1979 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
@@ -6,7 +6,9 @@
     <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TServerCarmodel">
         <id column="id" property="id" />
         <result column="type" property="type" />
-        <result column="name" property="name" />
+        <result column="chineseName" property="chineseName" />
+        <result column="englishName" property="englishName" />
+        <result column="frenchName" property="frenchName" />
         <result column="img" property="img" />
         <result column="state" property="state" />
         <result column="insertTime" property="insertTime" />
@@ -14,20 +16,20 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, type, name, img, state, insertTime
+        id, type, chineseName, englishName, frenchName, img, state, insertTime
     </sql>
 
     <!--根据条件查询服务车型列表-->
     <select id="getServerCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT * FROM t_server_carmodel as o
         <where>
-            o.type = #{type} and not FIND_IN_SET(o.state,'3')
             <if test="name != null and name != ''">
-                and o.name LIKE CONCAT('%',#{name},'%')
+                and o.chineseName LIKE CONCAT('%',#{name},'%') or o.englishName LIKE CONCAT('%',#{name},'%') or o.frenchName LIKE CONCAT('%',#{name},'%')
             </if>
             <if test="state != null and state != ''">
                 and o.state = #{state}
             </if>
+                 and (o.type =1 or o.type =4)
         </where>
         order by o.id desc
     </select>

--
Gitblit v1.7.1