diff --git a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java index 397e25fb2e9d9aa396df1a6eb93711eea593c490..d2e51f6407d65719ce3f433e52c763d4a1eac9e1 100644 --- a/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java +++ b/src/main/java/com/easysoftware/application/fieldpkg/vo/FieldPkgVo.java @@ -66,4 +66,9 @@ public class FieldPkgVo { * Description. */ private String description; + + /** + * maintainers. + */ + private String maintainers; } diff --git a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java index f54d74e8cbf53533a4caca185350de774ef3361d..dcf145863e13e27c257c58b50526ac168f082b94 100644 --- a/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java +++ b/src/main/java/com/easysoftware/application/filedapplication/vo/FiledApplicationVo.java @@ -67,4 +67,9 @@ public class FiledApplicationVo { */ private String description; + /** + * maintainers. + */ + private String maintainers; + } diff --git a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java index 7ac1c0c07913fbf960a3b915592bf511d83b1980..7dbe96606aaa8dadeb38f535266904ba5de781ab 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldapplication/gatewayimpl/dataobject/FieldApplicationDO.java @@ -72,4 +72,9 @@ public class FieldApplicationDO { */ private String description; + /** + * maintainers. + */ + private String maintainers; + } diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java index 72719a1362ff0ebacf0483f30a3b5f9c88ce1b0f..df31d915b6067d002e38758d5f6ec4a6a76d5149 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/converter/FieldPkgConverter.java @@ -16,6 +16,8 @@ import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.SortUtil; import com.easysoftware.infrastructure.fieldpkg.dataobject.FieldPkgDO; + +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -25,6 +27,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; public final class FieldPkgConverter { // Private constructor to prevent instantiation of the utility class @@ -107,6 +110,6 @@ public final class FieldPkgConverter { } catch (Exception e) { LOGGER.error(MessageCode.EC00011.getMsgEn(), e.getMessage()); } - return res; + return res.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList()); } } diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java index d84920ba67f7486ce1cd5478c2a1e901e14b16cb..ca0e079ca494247cee159d4bdb90109ec72c061e 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/dataobject/FieldPkgDO.java @@ -78,4 +78,9 @@ public class FieldPkgDO { */ @TableField(value = "count(*)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) private Integer count; + + /** + * maintainers. + */ + private String maintainers; }