Browse Source

Merge branch 'dev_data_fusion' into develop

dev_shibei_match
sunyuchao 4 years ago
parent
commit
5f959dd33f
  1. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

2
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

@ -136,7 +136,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
if (!CollectionUtils.isNotEmpty(list)) { if (!CollectionUtils.isNotEmpty(list)) {
return evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null); return evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
} else { } else {
list.add(agencyId); list.add(dto.getCustomerId());
return evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list); return evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
} }
} }

Loading…
Cancel
Save