From 80b725c050e4e4537cc5b7892e5969e537a9b38e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 五月 2024 18:17:13 +0800
Subject: [PATCH] 数据更改版次值为空判断
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
index 6e445e7..f4c1dc7 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
@@ -20,6 +20,7 @@
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.NacosConfigCache;
import com.vci.ubcs.system.entity.Tenant;
import com.vci.ubcs.system.entity.TenantPackage;
import com.vci.ubcs.system.service.ITenantPackageService;
@@ -69,11 +70,7 @@
private final ITenantPackageService tenantPackageService;
- /**
- * 瓒呯绉熸埛id
- */
- @Value("${user-info.tenant-id}")
- private String tenantId;
+ private final NacosConfigCache nacosConfigCache;
/**
* 璇︽儏
@@ -101,7 +98,7 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
- IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(pages);
}
@@ -114,7 +111,7 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
- List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(list);
}
@@ -234,11 +231,6 @@
@ApiOperation(value = "涓嬫媺绉熸埛淇℃伅")
public R<List> findAll() {
List<Map<String, Object>> mapList = tenantService.selectMaps();
- if(Func.isNotEmpty(tenantId)){
- Map<String, Object> map = new HashMap<>();
- map.put("绠＄悊缁�", tenantId);
- mapList.add(map);
- }
return R.data(mapList);
}
--
Gitblit v1.9.3