设备列表不展示display_flg=1的数据

ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml

@@ -152,6 +152,24 @@
         order by ed.device_id
     </select>
 
+    <select id="getAllSiteDeviceListNoDisp" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteDeviceListVo">
+        select  es.site_id as siteId,es.site_name as siteName,
+        ed.device_id as deviceId,ed.device_name as deviceName,
+        ed.device_type as deviceType,ed.device_status as deviceStatus,ed.work_status as workStatus,
+        ed.device_category as deviceCategory,
+        ed.picture_url as pictureUrl,
+        ed.id,
+        ed.parent_id as parentId
+        from ems_site_setting es INNER JOIN ems_devices_setting ed on es.site_id = ed.site_id and (ed.display_flg is null or ed.display_flg != '1')
+        where 1 = 1
+        <if test="siteId != null and siteId != ''">
+            and es.site_id = #{siteId}
+        </if>
+        <if test="deviceCategory != null and deviceCategory != ''">
+            and ed.device_category = #{deviceCategory}
+        </if>
+        order by ed.device_id
+    </select>
     <select id="getAllSiteId"  resultType="String">
         select distinct site_id from ems_site_setting
     </select>