From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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..a47ccf5 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
@@ -119,7 +119,7 @@
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
- //������in���
+ //������������
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
@@ -219,6 +219,7 @@
//������������������������������
List<Menu> nextLevelMenus = menus.stream()
.filter(o -> o.getParentId().equals(menu.getId()))
+ .sorted(Comparator.comparing(Menu::getOrder))
.collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
if (nextLevelMenus.size() > 0) {
@@ -342,7 +343,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 +361,6 @@
}
//������������
String password = user.getPassword();
- System.out.println("password==" + password);
if (!ObjectUtils.isEmpty(password)) {
//������������
password = AESUtils.decrypt(password, AESKey);
@@ -390,13 +389,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 +403,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 +413,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