Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -282,6 +282,7 @@
             screen_customer_agency sca
         WHERE
             sca.DEL_FLAG = '0'
+            and sca.IS_DISPLAY='1'
         <choose>
             <when test="areaCode != null and areaCode.trim() != ''">
                 AND sca.PARENT_AREA_CODE = #{areaCode}
@@ -296,6 +297,7 @@
         FROM
             screen_customer_grid m
             where m.DEL_FLAG = '0'
+             and m.IS_DISPLAY='1'
             <choose>
                 <when test="areaCode != null and areaCode.trim() != ''">
                     and m.AREA_CODE=#{areaCode}