From 5101e344b4ac9de94d0f18d8a501158be49221ff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 10:27:00 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 7251c0c..3241365 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.UserService;
import org.springframework.stereotype.Service;
@@ -28,5 +29,14 @@
public List<User> selectUserCondition(User user, String type) {
return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
}
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ * @return
+ */
+ @Override
+ public User getUserNow() {
+ return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
+ }
}
--
Gitblit v1.9.3