From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index b073d56..0a421a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.core.dto.PersonDto;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 鐢ㄦ埛淇℃伅琛�
@@ -11,5 +15,34 @@
  */
 public interface UserService extends IService<User> {
 
+    /**
+     * 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
+     * @param user
+     * @param type
+     * @return
+     */
+    List<User> selectUserCondition(User user, String type);
+
+    /**
+     * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+     * @return
+     */
+    User getUserNow();
+
+    /**
+     * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+     * @return
+     */
+    String selectUserDepartmentLimsName();
+
+
+    int upUserDepardLimsId(String ids, String id);
+
+    int delUserDepardLimsId(Integer id);
+
+    int addPersonUser(PersonDto personDto);
+
+    Map<String, List<Map<String,Object>>> getLaboratoryPersonList();
+
 }
 

--
Gitblit v1.9.3