diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java index 7e7e2864dd..7b6e81d2e0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java @@ -200,13 +200,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("机关名:"+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -333,13 +334,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("网格名:"+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -507,13 +509,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { resultList.add(party); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { resultList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return resultList; }