修复设备分类和设备型号问题

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml

@@ -7,11 +7,14 @@
         SELECT a.*
         FROM tower_model a
         <where>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
+            <if test="param.modelId != null">
+                AND a.model_id = #{param.modelId}
             </if>
-            <if test="param.title != null">
-                AND a.title LIKE CONCAT('%', #{param.title}, '%')
+            <if test="param.name != null">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            </if>
+            <if test="param.model != null">
+              AND a.model LIKE CONCAT('%', #{param.model}, '%')
             </if>
             <if test="param.parentId != null">
                 AND a.parent_id = #{param.parentId}
@@ -46,6 +49,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+          <if test="param.keywords != null">
+            AND (
+            a.name LIKE CONCAT('%', #{param.keywords}, '%')
+            OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
+            )
+          </if>
         </where>
     </sql>