Commit 51ab3335 by yao.xiao

Merge branch 'dev_20210617_xxy_tag' into dev_20210330

parents 6ca7e53d 0eec58af
...@@ -74,6 +74,7 @@ public class MetadataServiceImpl implements MetadataService { ...@@ -74,6 +74,7 @@ public class MetadataServiceImpl implements MetadataService {
mdTagNewAddList.addAll(mdTagNewListSelect); mdTagNewAddList.addAll(mdTagNewListSelect);
List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16); List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,tagQueryInfoList); classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,tagQueryInfoList);
tagQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
tagQueryInfo.setTagQueryInfos(tagQueryInfoList); tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
tagQueryInfos.add(tagQueryInfo); tagQueryInfos.add(tagQueryInfo);
} }
...@@ -96,6 +97,7 @@ public class MetadataServiceImpl implements MetadataService { ...@@ -96,6 +97,7 @@ public class MetadataServiceImpl implements MetadataService {
tagInfo.setUpdatedAt(CommonUtil.dateParseString(m.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss")); tagInfo.setUpdatedAt(CommonUtil.dateParseString(m.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
tagQueryInfoList.add(tagInfo); tagQueryInfoList.add(tagInfo);
}); });
tagQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
tagQueryInfo.setTagQueryInfos(tagQueryInfoList); tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
tagQueryInfos.add(tagQueryInfo); tagQueryInfos.add(tagQueryInfo);
} }
......
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