From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index 7fe1193..444fa13 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -64,7 +64,8 @@
String ip = WebUtils.getIpAddr(request);
userLog.setIp(ip);
userLog.setOperateId((Integer) userInfo.get("userId"));
- userLog.setOrganizationId((Integer) userInfo.get("organizationId"));
+ Map<String, Object> organization = (Map<String, Object>) userInfo.get("organization");
+ userLog.setOrganizationId((Integer) organization.get("id"));
userLog.setContent(userInfo.get("account") + "���������");
userLogService.save(userLog);
return ResultMessage.ok(data);
--
Gitblit v1.8.0