feats

src/main/resources/mapper/TdDeviceMapper.xml

@@ -19,9 +19,13 @@
                 LEFT JOIN td_device s ON t.device_kind = s.device_type
                     AND t.device_no = s.device_no AND s.`status` > -1
                 LEFT JOIN ta_machinery m ON s.machinery_id = m.machinery_id
-        WHERE
-            t.device_kind = #{deviceType}
+        WHERE 1 = 1
+        <if test="deviceType != null and deviceType != ''">
+            AND t.device_kind = #{deviceType}
+        </if>
+        <if test="onlineStatus != null">
           AND t.device_status = #{onlineStatus}
+        </if>
         ORDER BY
             t.create_date DESC
     </select>