From ba345976f0a6a67bcb20627e33251ded000a3d8f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期六, 25 五月 2024 22:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 baeec08..6f2455b 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,27 +17,30 @@
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;
+import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.system.entity.Dept;
+import com.vci.ubcs.system.enums.DictEnum;
import com.vci.ubcs.system.service.IDeptService;
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.User;
+import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.wrapper.DeptWrapper;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
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;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
-import com.vci.ubcs.system.cache.DictCache;
-import com.vci.ubcs.system.entity.Dept;
-import com.vci.ubcs.system.enums.DictEnum;
-import com.vci.ubcs.system.vo.DeptVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -61,6 +64,7 @@
public class DeptController extends BladeController {
private final IDeptService deptService;
+ private final NacosConfigCache nacosConfigCache;
/**
* 璇︽儏
@@ -85,7 +89,7 @@
@ApiOperation(value = "鍒楄〃", notes = "浼犲叆dept")
public R<List<DeptVO>> list(@ApiIgnore @RequestParam Map<String, Object> dept, BladeUser bladeUser) {
QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
- List<Dept> list = deptService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ List<Dept> list = deptService.list((!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(DeptWrapper.build().listNodeVO(list));
}
@@ -99,9 +103,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