1.解决监测点超标问题

2.解决监测点终端md3加密显示
3.解决全景技术监督问题数量问题

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml

@@ -13,13 +13,21 @@
         INNER JOIN supervision_temp_line_run_test b ON a.id = b.id
         INNER JOIN supervision_temp_line_run_test_warning c ON c.line_run_id = b.id
         <where>
-            c.create_time BETWEEN #{param.startTime} AND #{param.endTime}
+            (c.create_time BETWEEN #{param.startTime} AND #{param.endTime}
             <if test="orgIds != null and orgIds.size() > 0">
-                AND  a.org_id IN
+                AND a.org_id IN
+                <foreach collection="orgIds" item="orgId" separator="," open="(" close=")">
+                    #{orgId}
+                </foreach>
+            </if>)
+        or (c.deal_State = 0
+            <if test="orgIds != null and orgIds.size() > 0">
+                AND a.org_id IN
                 <foreach collection="orgIds" item="orgId" separator="," open="(" close=")">
                     #{orgId}
                 </foreach>
             </if>
+            )
         </where>
     </select>
 </mapper>