From 0593108084bd368d512290053d81454df79e06e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:28 +0800
Subject: [PATCH] chore:小程序查询提交
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0f2ef41..2d1e465 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
@@ -101,10 +101,11 @@
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
userInfo.put("unitId",userBo.getUnitId());
- userInfo.put("unName",responsibilityUnit.getAreaName());
+ userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
+ userInfo.put("organizationId",userBo.getOrganizationId());
userInfo.put("openid", openId);
try {
@@ -115,7 +116,7 @@
result.put("unitId",userBo.getUnitId());
result.put("userId", userBo.getId());
result.put("account", userBo.getAccount());
- result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -173,6 +174,7 @@
userInfo.put("mobile", user.getMobile());
userInfo.put("unitId",user.getUnitId());
// userInfo.put("unName",user.getAreaName());
+ userInfo.put("organizationId",user.getOrganizationId());
userInfo.put("wechat", user.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
userInfo.put("isAdmin", user.getIsAdmin());
@@ -181,12 +183,11 @@
//������token������������redis
String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
result.put("token", token);
- result.put("token", token);
result.put("userName", user.getUserName());
result.put("unitId",user.getUnitId());
result.put("userId", user.getId());
result.put("account", user.getAccount());
- result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -261,7 +262,7 @@
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
userInfo.put("unitId",userBo.getUnitId());
- userInfo.put("unName",responsibilityUnit.getAreaName());
+ userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
--
Gitblit v1.8.0