From f442f28a6ca58a9785c9fdad0479689a540ef903 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 24 Jun 2024 09:43:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E7=99=BB=E8=AE=B0bug?=
 =?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/TdPropertyInfoController.java  |  4 ++--
 .../system/property/data/propertyinfo.html         | 14 +++++++++-----
 .../mapper/system/TdPropertyInfoMapper.xml         |  3 ++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java
index b91c72e..638e26e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java
@@ -45,10 +45,10 @@ public class TdPropertyInfoController extends BaseController
     @RequiresPermissions("system:property:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@RequestParam String useId)
+    public TableDataInfo list(TdPropertyInfo tdPropertyInfo)
     {
         startPage();
-        List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
+        List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
         return getDataTable(tdPropertyInfos);
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
index 45e7618..589bc7c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
@@ -10,13 +10,9 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <label>资产编号：</label>
-                                <input type="text" name="useId"/>
-                            </li>
                             <li>
                                 <label>登记编号：</label>
-                                <input type="text" name="Id"/>
+                                <input type="text" name="id"/>
                             </li>
                             <li>
                                 <label>资产种类：</label>
@@ -85,6 +81,7 @@
                 detailUrl: prefix + "/detail/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                queryParams: queryParams,
                 modalName: "资产管理",
                 columns: [{
                     checkbox: true
@@ -141,6 +138,13 @@
             };
             $.table.init(options);
         });
+
+
+        function queryParams(params) {
+            var search = $.table.queryParams(params);
+            search.useId = [[${useId}]];
+            return search;
+        }
     </script>
 </body>
 </html>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
index 93bf77e..6072dee 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
@@ -41,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTdPropertyInfoList" parameterType="TdPropertyInfo" resultMap="TdPropertyInfoResult">
         <include refid="selectTdPropertyInfoVo"/>
-        <where>  
+        <where>
+            <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="useId != null  and useId != ''"> and use_id = #{useId}</if>
             <if test="propertyBrand != null  and propertyBrand != ''"> and property_brand = #{propertyBrand}</if>
             <if test="propertyMac != null  and propertyMac != ''"> and property_mac = #{propertyMac}</if>