Commit 5788889a authored by suhuiguang's avatar suhuiguang

1.圣元生产环境大屏bug

parent fdc3e377
......@@ -35,12 +35,14 @@ public class CylinderFillingMessageService extends BaseService<CylinderFillingMe
Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
uploadCylinderLogsByOrgCode.getRecords().stream().forEach(x -> {
x.setUseUnitCode(map.get(x.getAppId()));
});
if(appIds.size() > 0){
List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
x.setUseUnitCode(map.get(x.getAppId()));
});
}
}
return page;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment