From 1e494dc0cfd997c208c83f33a5b5dce5c53413d2 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 24 Sep 2024 15:23:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=BD=E4=BD=93=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E9=94=80=E6=AF=81=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carrier/issued/SaveIssuedController.java  |  2 +-
 .../manager/CarrierIssuedManager.java         |  4 +++
 .../mapper/carrier/TdCarrierIssuedMapper.java |  2 ++
 .../carrier/TdCarrierIssuedService.java       |  3 ++
 .../impl/TdCarrierIssuedServiceImpl.java      |  5 +++
 .../mapper/system/TdCarrierIssuedMapper.xml   | 31 +++++++++++++++++--
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/SaveIssuedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/SaveIssuedController.java
index d03d6734..62681932 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/SaveIssuedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/SaveIssuedController.java
@@ -42,7 +42,7 @@ public class SaveIssuedController extends BaseController {
     @ResponseBody
     public TableDataInfo list(TdCarrierIssued tdCarrierIssued) {
         startPage();
-        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierList(tdCarrierIssued);
+        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierSaveList(tdCarrierIssued);
         return getDataTable(carriers);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java
index 37d2dc1f..7bc675f4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java
@@ -41,6 +41,10 @@ public class CarrierIssuedManager {
         return carrierIssuedService.selectTdCarrierUserList(tdCarrierIssued);
     }
 
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) {
+        return carrierIssuedService.selectTdCarrierSaveList(tdCarrierIssued);
+    }
+
     public boolean saveOrUpdate(TdCarrierIssued tdCarrierIssued) {
         if (CharSequenceUtil.isNotBlank(tdCarrierIssued.getId())) {
             tdCarrierIssued.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java
index 07463a64..848d7460 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java
@@ -23,6 +23,8 @@ public interface TdCarrierIssuedMapper extends BaseMapper<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued);
 
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued);
+
 }
 
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java
index 72c545f2..100aff88 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java
@@ -23,4 +23,7 @@ public interface TdCarrierIssuedService extends IService<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued);
 
+
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java
index 7a02459e..c2652d6f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java
@@ -35,6 +35,11 @@ public class TdCarrierIssuedServiceImpl extends ServiceImpl<TdCarrierIssuedMappe
     public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) {
         return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued);
     }
+
+    @Override
+    public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) {
+        return tdCarrierIssuedMapper.selectTdCarrierSaveList(tdCarrierIssued);
+    }
 }
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
index 67fc9a96..912cb657 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
@@ -112,9 +112,7 @@
             <if test="areaDistrict!=null and areaDistrict!=''">
                 AND area_district = #{areaDistrict}
             </if>
-            <if test="status!=null and status!=''">
                 AND status in (1,2)
-            </if>
         </trim>
         ORDER BY create_time DESC
     </select>
@@ -146,10 +144,37 @@
             <if test="areaDistrict!=null and areaDistrict!=''">
                 AND area_district = #{areaDistrict}
             </if>
-            <if test="status!=null and status!=''">
                 AND status !='6'
+        </trim>
+        ORDER BY create_time DESC
+    </select>
+    <select id="selectTdCarrierSaveList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
+        select  <include refid="Base_Column_List"/> from  td_carrier_issued
+        <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>
+                AND status in (3,4)
         </trim>
         ORDER BY create_time DESC
+
     </select>
 </mapper>