From c6b118cf77295f4c23583cde9d7890b014691e66 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 13:10:30 +0800
Subject: [PATCH] 日志对象加枚举显示值转换
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 bd7e58d..bef0659 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
@@ -173,6 +173,7 @@
List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
return users;
}
+
@Override
public List<User> selectAllUser(){
LambdaQueryWrapper<User> wrapper= Wrappers.lambdaQuery();
@@ -518,8 +519,9 @@
return 0L;
}
QueryWrapper<User> wrapper = Wrappers.<User>query().eq("ID", userId);
+ User dbUser = this.getOne(wrapper);
//鑾峰彇鍒板瘑鐮佷慨鏀规椂闂�
- Date pwdUpdateTime = this.getOne(wrapper).getPwdUpdateTime();
+ Date pwdUpdateTime = Func.isNotEmpty(dbUser) ? dbUser.getPwdUpdateTime():new Date();
Long pwdupdateday = 0L;
if(!Func.isEmpty(pwdUpdateTime)){
pwdupdateday = dateToDay(pwdUpdateTime);
@@ -555,7 +557,7 @@
public List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName) {
// 鑰冭檻鍒颁竴涓敤鎴峰彲浠ユ嫢鏈夊绉嶈鑹叉潈闄愶紝鑰岀敤鎴峰叧鑱旇鑹叉潈闄愭槸鐢╮ole_id瀛楁鐢ㄩ�楀彿鍒嗛殧瑙掕壊id鐨勶紝鐩存帴閲囩敤瀛愭煡璇㈡潵in鏌ヨ涓嶈兘瀹炵幇锛屾墍浠ュ厛鏌ヨ瑙掕壊id
R<String> roleIds = sysClient.getRoleIds(user.getTenantId(), roleName);
- if(roleIds.getCode() != 200){
+ if(!roleIds.isSuccess()){
throw new ServiceException("绯荤粺鏈嶅姟feign鎺ュ彛璋冪敤閿欒锛�");
}
if(Func.isBlank(roleIds.getData())){
--
Gitblit v1.9.3