Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -445,6 +445,8 @@
             </if>
             <if test="areaCode != null and areaCode != ''">
                 AND sca.AREA_CODE like CONCAT(#{areaCode},'%')
+                AND sca.PARENT_AREA_CODE != ''
+                AND sca.PARENT_AREA_CODE IS NOT NULL
             </if>
 
     </select>