Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

5 years ago · d30bb6e686
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
@ -315,7 +315,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
        List<ScreenCustomerGridDTO> parentGridList = screenCustomerGridDao.selectListGridInfo(customerId);
        if (!CollectionUtils.isEmpty(parentGridList)) {
            parentGridList.forEach(o -> {
-                allParentIds.put(o.getGridId(), o.getGridId());
+                allParentIds.put(o.getGridId(), o.getAllParentIds());
            });
        }
        for (Map.Entry<String, List<FactIndexGridScoreDTO>> gridScore : collect.entrySet()) {