From 885d8364166b6e952e0af2eb4cf4e44c59544b96 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 16:36:25 +0800
Subject: [PATCH] 新增用户界面去掉岗位

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 92ef01f..f7418ec 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -22,6 +22,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.system.cache.DictCache;
 import com.vci.ubcs.system.cache.NacosConfigCache;
 import com.vci.ubcs.system.cache.ParamCache;
@@ -77,16 +78,13 @@
 	private final IUserOauthService userOauthService;
 	private final ISysClient sysClient;
 	private final BladeTenantProperties tenantProperties;
-	//鎷垮埌閰嶇疆鐨勮秴绠�
-	private final NacosConfigCache nacosConfigCache;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submit(User user) {
 		if (StringUtil.isBlank(user.getTenantId())) {
-			// user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
 			// 榛樿璁剧疆涓虹鐞嗙粍涓嬬殑鐢ㄦ埛
-			user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
+			user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
 		}
 		String tenantId = user.getTenantId();
 		//Tenant tenant = SysCache.getTenant(tenantId);
@@ -106,7 +104,7 @@
 		Boolean flag = true;
 		for (User user : users){
 			if (StringUtil.isBlank(user.getTenantId())) {
-				user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
+				user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
 			}
 			String tenantId = user.getTenantId();
 			if (Func.isNotEmpty(user.getPassword())) {
@@ -166,7 +164,7 @@
 	@Override
 	public List<User> selectAllUser(User user, Long deptId){
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
-		List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+		List<User> users = baseMapper.selectUserPage(user, deptIdList, (VciBaseUtil.checkAdminTenant() ? StringPool.EMPTY : AuthUtil.getTenantId()));
 		return users;
 	}
 
@@ -514,7 +512,7 @@
 	@Override
 	public Long checkRenAndExpr(Long userId) {
 		//瓒呯骇绠$悊鍛樼洿鎺ヨ繑鍥炰笉闇�瑕佹彁閱掑瘑鐮佷慨鏀�
-		if(nacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
+		if(NacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
 			return 0L;
 		}
 		QueryWrapper<User> wrapper = Wrappers.<User>query().eq("ID", userId);

--
Gitblit v1.9.3