From e14d495581896374cc4be7ec929feb95005e6563 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 15 六月 2023 18:22:39 +0800 Subject: [PATCH] 修改系统管理、编码规则管理bug --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java index 3c098e0..498661f 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java @@ -17,6 +17,7 @@ package com.vci.ubcs.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.system.cache.DictCache; @@ -32,6 +33,7 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; @@ -99,9 +101,9 @@ }) @ApiOperationSupport(order = 3) @ApiOperation(value = "鎳掑姞杞藉垪琛�", notes = "浼犲叆dept") - public R<List<DeptVO>> lazyList(@ApiIgnore @RequestParam Map<String, Object> dept, Long parentId, BladeUser bladeUser) { - List<DeptVO> list = deptService.lazyList(bladeUser.getTenantId(), parentId, dept); - return R.data(DeptWrapper.build().listNodeLazyVO(list)); + public R<IPage<DeptVO>> lazyList(@ApiIgnore @RequestParam Map<String, Object> dept, Query query, Long parentId, BladeUser bladeUser) { + IPage<DeptVO> list = deptService.lazyList(bladeUser.getTenantId(), parentId, dept, query); + return R.data(DeptWrapper.build().pageNodeLazyVO(list)); } /** -- Gitblit v1.9.3