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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java

@@ -15,6 +15,7 @@ import com.epmet.service.org.CustomerAgencyService;
 import com.epmet.service.stats.ScreenCentralZoneDataExtractService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -184,6 +185,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
             //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
             o.setGridMemberTotal(gridManagerMap.getOrDefault(orgId, NumConstant.ZERO));
         });
-        return result;
+        List<ScreenUserTotalDataEntity> newResult = result.stream().filter(o -> StringUtils.isNotBlank(o.getParentId())).collect(Collectors.toList());
+        return newResult;
     }
 }