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

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

@@ -241,6 +241,7 @@
         WHERE
             agency.DEL_FLAG = '0'
             AND agency.AREA_CODE like concat(#{areaCode},'%')
+            AND LENGTH(agency.PARENT_AREA_CODE) > 0
     </select>
 
     <!--   查找组织下的部门  -->

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -193,7 +193,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         List<CustomerUser4PointResultDTO> allData = userWechatDao.selectResiAndStrangerInfo(customerUserFormDTO.getCustomerId(),customerUserFormDTO.getName());
-        if (!CollectionUtils.isEmpty(allData)){
+        if (CollectionUtils.isEmpty(allData)){
             return new ArrayList<>();
         }
         allData.forEach(info -> {