From dc6ef723af9fd6c8474c935fd1e1a9dec2512b50 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 25 Jun 2024 14:43:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/property/TdPropertyNetinfoController.java  |  4 ++--
 .../templates/system/network/netinfo/netinfo.html     |  7 +++++++
 .../mapper/system/TdPropertyNetinfoMapper.xml         | 11 ++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java
index bc623b8..f05866a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java
@@ -45,10 +45,10 @@ public class TdPropertyNetinfoController extends BaseController
     @RequiresPermissions("system:network:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@RequestParam String netId)
+    public TableDataInfo list(TdPropertyNetinfo tdPropertyNetinfo)
     {
         startPage();
-        List<TdPropertyNetinfo> list = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId);
+        List<TdPropertyNetinfo> list = tdPropertyNetinfoService.selectTdPropertyNetinfoList(tdPropertyNetinfo);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
index 9e4fd56..c22de4b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
@@ -84,6 +84,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                queryParams: queryParams,
                 modalName: "涉密网络登记",
                 columns: [{
                     checkbox: true
@@ -146,6 +147,12 @@
                 }]
             };
             $.table.init(options);
+
+            function queryParams(params) {
+                var search = $.table.queryParams(params);
+                search.netId = [[${netId}]];
+                return search;
+            }
         });
     </script>
 </body>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml
index 583c52d..7c84ce7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyNetinfoMapper.xml
@@ -27,12 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTdPropertyNetinfoList" parameterType="TdPropertyNetinfo" resultMap="TdPropertyNetinfoResult">
         <include refid="selectTdPropertyNetinfoVo"/>
-        <where>  
-            <if test="netId != null "> and net_id = #{netId}</if>
-            <if test="netBrand != null "> and net_brand = #{netBrand}</if>
+        <where>
+            <if test="id != null and id != '' "> and id = #{id}</if>
+            <if test="netId != null and netId != '' "> and net_id = #{netId}</if>
+            <if test="netBrand != null and netBrand != '' "> and net_brand = #{netBrand}</if>
             <if test="netIp != null "> and net_ip = #{netIp}</if>
-            <if test="netNo != null "> and net_no = #{netNo}</if>
-            <if test="netName != null "> and net_name = #{netName}</if>
+            <if test="netNo != null and netNo != '' "> and net_no = #{netNo}</if>
+            <if test="netName != null  and netName != '' "> and net_name = #{netName}</if>
             <if test="netSn != null "> and net_sn = #{netSn}</if>
             <if test="netname != null "> and netname = #{netname}</if>
             <if test="netManager != null "> and net_manager = #{netManager}</if>