From 21efef7a1bd566caf512548c6a9d99ba8dc0960a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Aug 2021 14:20:13 +0800
Subject: [PATCH] 登陆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..55f7c8a 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
@@ -141,11 +141,12 @@
//���������������
Group group = userBo.getGroup();
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
- groupMap.put("id", group.getId());
- groupMap.put("groupName", group.getGroupName());
-
- userInfo.put("group", groupMap);
+ if (group != null) {
+ Map<String, Object> groupMap = new LinkedHashMap<>();
+ 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