From c3909964c361700fde7b1f7a64444747454800f4 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 22 Aug 2024 15:22:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=BD=E4=BD=93=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carrier/DestoryCarrierController.java     |  2 +-
 .../carrier/MaintainCarrierController.java    |  2 +-
 .../controller/manager/CarrierManager.java    |  4 +++
 .../mapper/carrier/TdCarrierMapper.java       |  3 ++
 .../service/carrier/TdCarrierService.java     |  3 ++
 .../carrier/impl/TdCarrierServiceImpl.java    |  5 ++++
 .../mapper/system/TdCarrierMapper.xml         | 30 +++++++++++++++++++
 7 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java
index 0a3d49f..e482ab2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java
@@ -40,7 +40,7 @@ public class DestoryCarrierController extends BaseController {
     @ResponseBody
     public TableDataInfo list(TdCarrier tdCarrier) {
         startPage();
-        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierUpdateList(tdCarrier);
         return getDataTable(carriers);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java
index f707da8..12690e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java
@@ -40,7 +40,7 @@ public class MaintainCarrierController extends BaseController {
     @ResponseBody
     public TableDataInfo list(TdCarrier tdCarrier) {
         startPage();
-        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierUpdateList(tdCarrier);
         return getDataTable(carriers);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java
index 6de2ba2..91f3e82 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java
@@ -32,6 +32,10 @@ public class CarrierManager {
         return carrierService.selectTdCarrierList(tdCarrier);
     }
 
+    public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) {
+        return carrierService.selectTdCarrierUpdateList(tdCarrier);
+    }
+
 
     public boolean saveOrUpdate(TdCarrier tdCarrier) {
         if (CharSequenceUtil.isNotBlank(tdCarrier.getId())) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierMapper.java
index 587e7f3..be34c05 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierMapper.java
@@ -16,6 +16,9 @@ public interface TdCarrierMapper extends BaseMapper<TdCarrier> {
 
     public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier);
 
+
+    public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier);
+
 }
 
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierService.java
index 6c46927..ff956fd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierService.java
@@ -15,4 +15,7 @@ public interface TdCarrierService extends IService<TdCarrier> {
 
     public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier);
 
+
+    public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java
index fb5dc33..0961d0f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java
@@ -26,6 +26,11 @@ public class TdCarrierServiceImpl extends ServiceImpl<TdCarrierMapper, TdCarrier
     public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) {
         return carrierMapper.selectTdCarrierList(tdCarrier);
     }
+
+    @Override
+    public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) {
+        return carrierMapper.selectTdCarrierUpdateList(tdCarrier);
+    }
 }
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
index 9585999..cfbb89f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
@@ -88,6 +88,36 @@
             </if>
         </trim>
         ORDER BY create_time DESC
+    </select>
 
+    <select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
+        select  <include refid="Base_Column_List"/> from  td_carrier
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="carrierName!=null and carrierName!=''">
+                AND carrier_name LIKE concat('%',#{carrierName},'%')
+            </if>
+            <if test="carrierLevel!=null and carrierLevel!=''">
+                AND carrier_level = #{carrierLevel}
+            </if>
+            <if test="carrierExtent!=null and carrierExtent!=''">
+                AND carrier_extent = #{carrierExtent}
+            </if>
+            <if test="carrierSecret!=null and carrierSecret!=''">
+                AND carrier_secret = #{carrierSecret}
+            </if>
+            <if test="carrierNumber!=null and carrierNumber!=''">
+                AND carrier_number = #{carrierNumber}
+            </if>
+            <if test="areaCity!=null and areaCity!=''">
+                AND area_city = #{areaCity}
+            </if>
+            <if test="areaDistrict!=null and areaDistrict!=''">
+                AND area_district = #{areaDistrict}
+            </if>
+            <if test="status!=null and status!=''">
+                AND status !='7'
+            </if>
+        </trim>
+        ORDER BY create_time DESC
     </select>
 </mapper>