From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整

---
 DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml
index 59f2c02..5bf3545 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml
@@ -52,8 +52,6 @@
         <result column="flag" property="flag"/>
         <result column="upload" property="upload"/>
         <result column="insertTime" property="insertTime"/>
-        <result column="holidayFee" property="holidayFee"/>
-
     </resultMap>
 
 
@@ -116,7 +114,7 @@
             and provinceCode = #{province} and cityCode = #{city} and (areaCode = '' or areaCode is null)
         </if>
         <if test="null != province and null == city and null == code">
-            and provinceCode = #{province} and (cityCode = '' or cityCode is null) and (areaCode = '' or areaCode is null)
+            and provinceCode = #{province} and (cityCode == '' or cityCode is null) and (areaCode = '' or areaCode is null)
         </if>
         )
     </select>

--
Gitblit v1.7.1