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 | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 28b0663..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);
@@ -526,7 +524,7 @@
pwdupdateday = dateToDay(pwdUpdateTime);
}
Strategy strategy = sysClient.getByUserId(userId).getData();
- if(Func.isNotEmpty(strategy)){
+ if(Func.isEmpty(strategy)){
throw new ServiceException("瀵嗙爜绛栫暐鏌ヨ涓虹┖锛岃妫�鏌ュ綋鍓嶇鎴蜂笅鏄惁瀛樺湪榛樿瀵嗙爜绛栫暐锛�");
}
//鏄惁鎻愰啋閫氳繃鏈�鍚庝竴娆′慨鏀瑰瘑鐮佺殑鏃堕棿鍔犱笂杩囨湡鏃堕棿鍑忓幓褰撳墠鏃堕棿锛屽鏋滃皬浜庤繃鏈熸彁閱掓椂闂村氨杩涜鎻愰啋锛屽鏋�<=0灏辨彁閱掑繀椤讳慨鏀瑰瘑鐮�
@@ -581,11 +579,11 @@
*/
@Override
public boolean updateUserStatus(String userIds, boolean status) {
- Integer user_status=0;
+ Integer userStatus = 0;
if(!status){
- user_status=1;
+ userStatus = 1;
}
- return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,user_status));
+ return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,userStatus));
}
/**
--
Gitblit v1.9.3