From d45606e59e08669d99e830554722b40452209d9e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 24 Aug 2021 08:45:34 +0800
Subject: [PATCH] 页面布局查询、新建、删除接口
---
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