From 8e832c69b20bd34f6da9ef25324ec690d1cccbe3 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 30 一月 2024 11:30:32 +0800 Subject: [PATCH] 业务类型对象,分类授权,字符集相关代码修改 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java index 1d2927e..bb016e6 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java @@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.vci.ubcs.omd.cache.EnumCache; import com.vci.ubcs.omd.constant.BtmTypeConstant; import com.vci.ubcs.omd.constant.BtmTypeFieldConstant; import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO; import com.vci.ubcs.omd.entity.*; +import com.vci.ubcs.omd.enums.EnumEnum; import com.vci.ubcs.omd.repeater.DomainRepeater; import com.vci.ubcs.omd.service.*; import com.vci.ubcs.omd.vo.*; @@ -1053,7 +1055,14 @@ }); } - return list; + // 璁剧疆瀛楁绫诲瀷涓枃鏄剧ず鍊�,鍜屾帓搴� + List<BtmTypeAttributeVO> sortedList = list.stream() + .sorted(Comparator.comparing(BtmTypeAttributeVO::getIsDefaultAttr)) + .map(item-> { + item.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE, item.getAttrDataType())); + return item; + }).collect(Collectors.toList()); + return sortedList; } } -- Gitblit v1.9.3