From 34406a710e05e92ac266ff035988267c9321723e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Oct 2021 14:11:55 +0800
Subject: [PATCH] 前台账户过期时间逻辑update
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 161de75..ae847c4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -342,7 +342,6 @@
/*String account = beforeUser.getAccount();
//account������������
user.setAccount(account);*/
- System.out.println(user);
if (!ObjectUtils.isEmpty(user.getAccount())) {
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount());
@@ -361,7 +360,6 @@
}
//������������
String password = user.getPassword();
- System.out.println("password==" + password);
if (!ObjectUtils.isEmpty(password)) {
//������������
password = AESUtils.decrypt(password, AESKey);
@@ -390,13 +388,9 @@
Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
if (userExpireTime != null) {
if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
- user.setExpireTime(orgExpireTime);
- } else {
- user.setExpireTime(userExpireTime);
- }
- } else {
- if (orgExpireTime != null) {
- user.setExpireTime(orgExpireTime);
+ result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode());
+ result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg());
+ return result;
}
}
//������redis
@@ -408,7 +402,8 @@
userMapper.updateById(user);
//������
- StringBuilder content = new StringBuilder("������������������" + user.getAccount() + "->");
+ String account = userMapper.selectById(userId).getAccount();
+ StringBuilder content = new StringBuilder("������������������" + account + "->");
for (String key : update.keySet()) {
Object afterValue = update.get(key);
if (!key.equals("id") && afterValue != null) {
@@ -417,7 +412,6 @@
content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
}
}
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
return result;
}
--
Gitblit v1.8.0