From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 46171c8..74d935a 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
@@ -80,6 +80,9 @@
@Autowired
private OperationLogUtils operationLogUtils;
+ @Autowired
+ private ResponsibilityUnitMapper responsibilityUnitMapper;
+
@Value("${AES.KEY}")
private String AESKey;
@@ -120,6 +123,7 @@
result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
return result;
}
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
userInfo.put("userId", userBo.getId());
@@ -128,6 +132,7 @@
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
userInfo.put("unitId",userBo.getUnitId());
+ userInfo.put("unName",responsibilityUnit.getAreaName());
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -184,9 +189,10 @@
result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
return result;
}
+
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
-
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
//������������
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
@@ -194,6 +200,7 @@
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
userInfo.put("unitId",userBo.getUnitId());
+ userInfo.put("unName",responsibilityUnit.getAreaName());
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
--
Gitblit v1.8.0