From 35ad24a24e91e1996ef9e97c2714bfbc7a32cdfa Mon Sep 17 00:00:00 2001
From: 1428594221 <1428594221@qq.com>
Date: 星期二, 27 六月 2023 17:18:03 +0800
Subject: [PATCH] 默认参照列表接口修改
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
index b17f24f..3a3f857 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
@@ -17,20 +17,23 @@
package com.vci.ubcs.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.system.cache.SysCache;
+import com.vci.ubcs.system.entity.Dept;
import com.vci.ubcs.system.mapper.DeptMapper;
import com.vci.ubcs.system.service.IDeptService;
+import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.wrapper.DeptWrapper;
-import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
-import com.vci.ubcs.system.cache.SysCache;
-import com.vci.ubcs.system.entity.Dept;
-import com.vci.ubcs.system.vo.DeptVO;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -49,7 +52,7 @@
private static final String PARENT_ID = "parentId";
@Override
- public List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param) {
+ public IPage<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param, Query query) {
// 璁剧疆绉熸埛ID
if (AuthUtil.isAdministrator()) {
tenantId = StringPool.EMPTY;
@@ -74,13 +77,14 @@
if (Func.isEmpty(param.get(PARENT_ID)) && param.size() > 1 && Func.toLong(parentId) == 0L) {
parentId = null;
}
- return baseMapper.lazyList(tenantId, parentId, param);
+ return baseMapper.lazyList(tenantId, parentId, param, Condition.getPage(query));
}
@Override
public List<DeptVO> tree(String tenantId) {
- return ForestNodeMerger.merge(baseMapper.tree(tenantId));
+ List<DeptVO> tree = baseMapper.tree(tenantId);
+ return ForestNodeMerger.merge(tree);
}
@Override
--
Gitblit v1.9.3