From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001 From: weidy <lastanimals@163.com> Date: 星期二, 20 六月 2023 17:07:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/wrapper/DeptWrapper.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/wrapper/DeptWrapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/wrapper/DeptWrapper.java index f1d71a2..2a64087 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/wrapper/DeptWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/wrapper/DeptWrapper.java @@ -16,6 +16,9 @@ */ package com.vci.ubcs.system.wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.vci.ubcs.common.utils.PageDO2PageVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; @@ -75,4 +78,14 @@ return ForestNodeMerger.merge(collect); } + public IPage<DeptVO> pageNodeLazyVO(IPage<DeptVO> page) { + List<DeptVO> deptVOS = page.getRecords().stream().peek(dept -> { + String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()); + Objects.requireNonNull(dept).setDeptCategoryName(category); + }).collect(Collectors.toList()); + List<DeptVO> list = ForestNodeMerger.merge(deptVOS); + page.setRecords(list); + return page; + } + } -- Gitblit v1.9.3