From 977604312c435fc826028d3340e8f904d6eb6534 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 10:53:37 +0800
Subject: [PATCH] screen-manage 修复登陆bug
---
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 b3a584b..87ca042 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
@@ -140,12 +140,13 @@
//���������������
Group group = userBo.getGroup();
-
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
- groupMap.put("id", group.getId());
- groupMap.put("groupName", group.getGroupName());
-
+ Map<String, Object> groupMap = new LinkedHashMap<>();
userInfo.put("group", groupMap);
+ if (group != null) {
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+ userInfo.put("group", groupMap);
+ }
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
--
Gitblit v1.8.0