Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -126,7 +126,12 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 if (null != gridInfo) {
                     user.setGridName(gridInfo.getGridName());
                     user.setOrgId(gridInfo.getAgencyId());
+                    if(StringUtils.isNotBlank(gridInfo.getOrgName())){
                         user.setOrgName(gridInfo.getOrgName());
+                    }else{
+                        GridInfoDTO gridInfoDTO = customerGridService.queryGridInfoDTO(user.getGridId());
+                        user.setOrgName(gridInfoDTO.getOrgName());
+                    }
                     //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
                     user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA));
                 }else{