Merge remote-tracking branch 'origin/main'

2021-08-17 15:55:06 +08:00 · 2021-08-17 15:55:06 +08:00 · 8818aae96f
commit 8818aae96f
parent 30e4e87227 222fb064c0
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/mybatis/mapper/alarmlog/alarm-log-mapper.xml
+++ b/src/main/resources/mybatis/mapper/alarmlog/alarm-log-mapper.xml
@ -75,7 +75,7 @@
        LEFT JOIN
            pollute_poll jt3
        ON
-            t1.poll_id = jt3.poll_no
+            (t1.poll_id = jt3.poll_no OR t1.poll_id = jt3.poll_no_old)
        WHERE
            1 = 1
        <if test="keywords != null and keywords != ''">