From aa14c4477706ae01570c02b19538f03d0ace6bd6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 16 八月 2023 21:24:11 +0800
Subject: [PATCH] 修改checkRenAndExpr接口
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 4 +++-
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 4 ++--
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java | 4 +---
Source/UBCS-WEB/vue.config.js | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 0503d9e..8148bc7 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -22,13 +22,13 @@
},
//寮�鍙戞ā寮忓弽鍚戜唬鐞嗛厤缃紝鐢熶骇妯″紡璇蜂娇鐢∟ginx閮ㄧ讲骞堕厤缃弽鍚戜唬鐞�
devServer: {
- port: 38000,
+ port: 8080,
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.0.105:37000',
// target: 'http://192.168.0.103:37000',
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index 9e71a03..8dc9198 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -40,8 +40,8 @@
/**
* nacos dev 鍦板潃
*/
- //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- String NACOS_DEV_ADDR = "localhost:8848";
+ String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
+ //String NACOS_DEV_ADDR = "localhost:8848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
index 74db1d6..19f6d21 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
@@ -90,11 +90,9 @@
* @return
*/
List<User> selectAllUser(User user, Long deptId);
+
/**
* 鑾峰彇鎵�鏈�
- *
- * @param user
- * @param deptId
* @return
*/
List<User> selectAllUser();
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 36c1966..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);
--
Gitblit v1.9.3