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/utils/OperationLogUtils.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
index c217379..88afde3 100644
--- a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -31,7 +31,8 @@
UserLog userLog = new UserLog();
userLog.setIp(WebUtils.getIpAddr(request));
userLog.setOperateId((Integer) currentUserInfo.get("userId"));
- userLog.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ userLog.setOrganizationId((Integer) orgInfo.get("id"));
userLog.setContent(content);
userLogService.save(userLog);
}
--
Gitblit v1.8.0