Merge remote-tracking branch 'origin/jtdev' into jtdev

shenyijian

2024-06-27 8498f55c1b6433b96cf95655b0fdb2f63ff42205

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml

@@ -145,7 +145,7 @@
                                LEFT JOIN YWXT."att_ad_base" province ON province."ad_code" = city."p_ad_code"
                        where (town."ad_code" = aab."guid" or county."ad_code" = aab."guid" or city."ad_code" = aab."guid" or province."ad_code" = aab."guid")
                          <!--只有已审核数据才显示-->
                        and (trgis."check_state" = 3)
                        and (trgis."check_state" = 3 and totalDangerNum > 0)
                    )
               ) dangerNum
        FROM YWXT."att_ad_base" aab