【中心级】一张图全景监控>设备管理>消防水池>二级页面，水池列表查询接口报错

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5119,7 +5119,6 @@
         from
         wl_equipment_specific_index ei
         where
-            -- or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' 此处由于单位会出现多个，所以无法确定选择哪一个，所以此处默认用一个指标的单位进行单位换算
         (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
         and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0 limit 1) AS 'unit',
         IFNULL( rp.volume, 0 ) AS volume,
@@ -5279,7 +5278,7 @@
                 c.`status` = #{status}
             </if>
         </where>
-        <if test="sortFlag != null and sortFlag != '' and sortFlag = '1'">
+        <if test="sortFlag != null and  sortFlag == '1'">
             <choose>
                 <when test="sortOrder == 'ascend'">
                     ORDER BY CONVERT(c.bizOrgName USING gbk) ASC
@@ -5289,7 +5288,7 @@
                 </otherwise>
             </choose>
         </if>
-        <if test="sortFlag != null and sortFlag != '' and sortFlag = '2'">
+        <if test="sortFlag != null and  sortFlag == '2'">
             <choose>
                 <when test="sortOrder == 'ascend'">
                     ORDER BY d.eligibility ASC
@@ -5394,7 +5393,6 @@
         from
         wl_equipment_specific_index ei
         where
-        -- or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' 此处由于单位会出现多个，所以无法确定选择哪一个，所以此处默认用一个指标的单位进行单位换算
         (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key =
         'FHS_WirelessliquidDetector_WaterLevel')
         and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0 limit 1) AS 'unit',