From d2afa808c6b182fe5867a7df8cde3b8668b25c1d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/mom/service/UserService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index e584c81..067fa11 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -1,14 +1,14 @@
 package com.yuanchu.mom.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PersonDto;
 import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.pojo.User;
 
 import java.util.List;
 import java.util.Map;
 
-public interface UserService {
+public interface UserService  {
 
     /*鍒ゆ柇鏄惁鐧诲綍鎴愬姛*/
     User selectUserByPwd(String account, String password);
@@ -18,8 +18,27 @@
 
     Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user);
 
+    Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user);
+
     int updateUser(User user);
 
     int addUser(User user);
 
+    List<User> getUserMenu();
+
+    //鑾峰彇璁惧璐熻矗浜�
+    List<User> getDeviceManager();
+
+    User getUserNow();
+
+    User getUserInfo();
+
+    int upUserPassword(String oldPassword, String newPassWord);
+
+    int addPersonUser(PersonDto personDto);
+
+    int upUserDepardLimsId(String ids, String id);
+
+    int delUserDepardLimsId(Integer id);
+
 }

--
Gitblit v1.9.3