Browse Source

Merge branch 'feature/statistical_zhy'

feature/teamB_zz_wgh
zhangyuan 3 years ago
parent
commit
53fc5eb722
  1. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

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

@ -103,7 +103,9 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
} }
} }
FactUserHouseResultDTO dto = total(params); FactUserHouseResultDTO dto = total(params);
dto.setAgencyName("合计"); if (dto != null) {
dto.setAgencyName("合计");
}
list.add(dto); list.add(dto);
return list; return list;
} }

Loading…
Cancel
Save