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

4 years ago · b46fc9dddb
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java
@ -66,7 +66,7 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
        }
        List<CategoryCountListResultDTO> datas = list.getData();
        if (CollectionUtils.isNotEmpty(datas)){
-            result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
+            result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getWarnConfigId())).forEach(d -> r.setCount(d.getCount())));
        }
        return result;
    }