From b7e9eb6b4fdd7ba3c7b443526088052ec578037e Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 24 Sep 2024 15:19:58 +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/UseIssuedController.java   |  2 +-
 .../manager/CarrierIssuedManager.java         |  4 +++
 .../mapper/carrier/TdCarrierIssuedMapper.java |  3 ++
 .../carrier/TdCarrierIssuedService.java       |  3 ++
 .../impl/TdCarrierIssuedServiceImpl.java      |  5 +++
 .../mapper/system/TdCarrierIssuedMapper.xml   | 35 +++++++++++++++++++
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/UseIssuedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/UseIssuedController.java
index ccb865b..d317fce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/UseIssuedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/issued/UseIssuedController.java
@@ -41,7 +41,7 @@ public class UseIssuedController extends BaseController {
     @ResponseBody
     public TableDataInfo list(TdCarrierIssued tdCarrierIssued) {
         startPage();
-        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierList(tdCarrierIssued);
+        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierUserList(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 e51595c..37d2dc1 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
@@ -37,6 +37,10 @@ public class CarrierIssuedManager {
         return carrierIssuedService.selectTdCarrierUpdateList(tdCarrierIssued);
     }
 
+    public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) {
+        return carrierIssuedService.selectTdCarrierUserList(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 2b32397..07463a6 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
@@ -20,6 +20,9 @@ public interface TdCarrierIssuedMapper extends BaseMapper<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued);
 
+
+    public List<TdCarrierIssued> selectTdCarrierUserList(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 cb287ea..72c545f 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
@@ -20,4 +20,7 @@ public interface TdCarrierIssuedService extends IService<TdCarrierIssued> {
 
     public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued);
 
+
+    public List<TdCarrierIssued> selectTdCarrierUserList(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 f94f6f5..7a02459 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
@@ -30,6 +30,11 @@ public class TdCarrierIssuedServiceImpl extends ServiceImpl<TdCarrierIssuedMappe
     public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued) {
         return tdCarrierIssuedMapper.selectTdCarrierUpdateList(tdCarrierIssued);
     }
+
+    @Override
+    public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) {
+        return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued);
+    }
 }
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
index 426c203..67fc9a9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
@@ -87,6 +87,41 @@
         ORDER BY create_time DESC
     </select>
 
+
+    <select id="selectTdCarrierUserList" 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>
+            <if test="status!=null and status!=''">
+                AND status in (1,2)
+            </if>
+        </trim>
+        ORDER BY create_time DESC
+    </select>
+
+
+
+
     <select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
         select  <include refid="Base_Column_List"/> from  td_carrier_issued
         <trim prefix="where" prefixOverrides="and|or">