diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java index c9c4464c..c1909b14 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java @@ -29,6 +29,7 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.NullToEmptyUtil; import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -169,14 +170,22 @@ public class ResetSearchCenterServiceTemp { page.setPageSize(count); page.setMenuId("nomenu"); page.setStandType("ALL"); - List rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page); + List rowsStand = new ArrayList<>(); + for (SarStandardsInfo sarStandardsInfo : iSarStandardsInfoService.getSarStandardsInfoPage(page)) { + SarStandardsInfo info = NullToEmptyUtil.noNullStringAttr(sarStandardsInfo); + rowsStand.add(info); + } //如果时自动触发,删除需要根据全部的结果进行数据处理 SarStandardsInfoEOPage infoEOPage = new SarStandardsInfoEOPage(); List allStand = null; if (StringUtils.isNotBlank(page.getSyncParam())) { BeanUtils.copyProperties(page, infoEOPage); infoEOPage.setSyncParam(null); - allStand = iSarStandardsInfoService.getSarStandardsInfoPage(infoEOPage); + allStand = new ArrayList<>(); + for (SarStandardsInfo sarStandardsInfo : iSarStandardsInfoService.getSarStandardsInfoPage(page)) { + SarStandardsInfo info = NullToEmptyUtil.noNullStringAttr(sarStandardsInfo); + allStand.add(info); + } } String isAll = null == allStand ? "否" : "是"; logger.info("是否查询了全部数据信息:" + isAll); @@ -471,15 +480,22 @@ public class ResetSearchCenterServiceTemp { if(count3 > 0){ sarBussionessStandEOPage.setPageSize(count3); - - List rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage); + List rowsStand = new ArrayList<>(); + for (SarBussionessStand bussionessStand : iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage)) { + SarBussionessStand stand = NullToEmptyUtil.noNullStringAttr(bussionessStand); + rowsStand.add(stand); + } //如果时自动触发,删除需要根据全部的结果进行数据处理 SarBussionessStandEOPage infoEOPage = new SarBussionessStandEOPage(); List allStand = null; if (StringUtils.isNotBlank(sarBussionessStandEOPage.getSyncParam())) { BeanUtils.copyProperties(sarBussionessStandEOPage, infoEOPage); infoEOPage.setSyncParam(null); - allStand = iSarBussionessStandService.getSarBussionStandPage(infoEOPage); + allStand = new ArrayList<>(); + for (SarBussionessStand bussionessStand : iSarBussionessStandService.getSarBussionStandPage(infoEOPage)) { + SarBussionessStand stand = NullToEmptyUtil.noNullStringAttr(bussionessStand); + allStand.add(stand); + } } String isAll = null == allStand ? "否" : "是"; logger.info("是否查询了全部数据信息:" + isAll); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/NullToEmptyUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/NullToEmptyUtil.java new file mode 100644 index 00000000..4b5b7e6a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/NullToEmptyUtil.java @@ -0,0 +1,34 @@ +package com.adc.da.utils.util; + +import java.lang.reflect.Field; + +public class NullToEmptyUtil { + + /** + * 把对象中的 String 类型的null字段,转换为空字符串 + * + * @param 待转化对象类型 + * @param cls 待转化对象 + * @return 转化好的对象 + */ + public static T noNullStringAttr(T cls) { + Field[] fields = cls.getClass().getDeclaredFields(); + if (fields == null || fields.length == 0) { + return cls; + } + for (Field field : fields) { + if ("String".equals(field.getType().getSimpleName())) { + field.setAccessible(true); + try { + Object value = field.get(cls); + if (value == null) { + field.set(cls, ""); + } + } catch (IllegalArgumentException | IllegalAccessException e) { + e.printStackTrace(); + } + } + } + return cls; + } +}