From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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 acc052e..6bc48f5 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
@@ -2,9 +2,13 @@
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;
+
+import java.util.List;
/**
* 鐢ㄦ埛淇℃伅琛�
@@ -15,5 +19,33 @@
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+ /**
+ * 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
+ * @param user
+ * @param type
+ * @return
+ */
+ @Override
+ 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());
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @Override
+ public String selectUserDepartmentLimsName() {
+ return baseMapper.selectUserDepartmentLimsName(SecurityUtils.getUserId().intValue());
+ }
}
--
Gitblit v1.9.3