From 736b58a43b0afb40745f885f400ef97d070f46a9 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
index 4198c9a..5c98255 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
@@ -284,6 +284,12 @@
         }
     }
 
+    public static String getUserId(){
+        return Optional.ofNullable(getCurrentUser())
+                .map(u -> u.getUserId().toString())
+                .orElse("1");
+    }
+
     /**
      * 获取当前用户名称
      *

--
Gitblit v1.8.0