From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/mapper/sys/UserMapper.java |   90 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lf/server/mapper/sys/UserMapper.java b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
index f4945f9..d94f5df 100644
--- a/src/main/java/com/lf/server/mapper/sys/UserMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
@@ -1,5 +1,6 @@
 package com.lf.server.mapper.sys;
 
+import com.lf.server.entity.sys.RoleEntity;
 import com.lf.server.entity.sys.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -7,31 +8,32 @@
 import java.util.List;
 
 /**
- * 瀛楀吀绠＄悊
+ * 鐢ㄦ埛绠＄悊
  * @author sws
  * @date 2022-09-27
  */
 @Mapper
 @Repository
 public interface UserMapper {
-
     /**
-     * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁�
+     * 鏌ヨ璁板綍鏁�
      *
-     * @param uname 鐢ㄦ埛鍚�
+     * @param uname   鐢ㄦ埛鍚�
+     * @param depcode 鍗曚綅缂栫爜
      * @return 璁板綍鏁�
      */
-    public Integer selectCount(String uname);
+    public Integer selectCount(String uname, String depcode);
 
     /**
-     * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ
+     * 鍒嗛〉鏌ヨ
      *
-     * @param uname  鐢ㄦ埗鍚�
-     * @param limit  璁板綍琛�
-     * @param offset 鍋忕Щ閲�
+     * @param uname   鐢ㄦ埗鍚�
+     * @param depcode 鍗曚綅缂栫爜
+     * @param limit   璁板綍鏁�
+     * @param offset  鍋忕Щ閲�
      * @return 鍒楄〃
      */
-    public List<UserEntity> selectByPage(String uname, Integer limit, Integer offset);
+    public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset);
 
     /**
      * 鏍规嵁token鏈夋晥鏈熸煡璇�
@@ -40,6 +42,38 @@
      * @return
      */
     public UserEntity selectByToken(String token);
+
+    /**
+     * 鏌ヨ鏄�/鍚︿负Admin
+     *
+     * @param id ID
+     * @return 缁熻鏁�
+     */
+    public Integer selectForIsAdmin(Integer id);
+
+    /**
+     * 鏌ヨ绠＄悊鍛樼敤鎴�
+     *
+     * @param type 绠＄悊鍛樼被鍒�
+     * @return
+     */
+    public List<UserEntity> selectAdminUsers(Integer type);
+
+    /**
+     * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
+     *
+     * @param id 鐢ㄦ埛ID
+     * @return 瑙掕壊闆嗗悎
+     */
+    public List<RoleEntity> selectRoleByUserId(Integer id);
+
+    /**
+     * 鏍规嵁瑙掕壊鏌ヨ鐢ㄦ埛
+     *
+     * @param roleId 瑙掕壊ID
+     * @return 鐢ㄦ埛闆嗗悎
+     */
+    public List<UserEntity> selectUserByRoleId(Integer roleId);
 
     /**
      * 鎻掑叆涓�鏉�
@@ -79,7 +113,7 @@
      * @param userEntity
      * @return
      */
-    public Integer updateUsers(UserEntity userEntity);
+    public Integer updateUser(UserEntity userEntity);
 
     /**
      * 鏌ヨ鍗曟潯鏁版嵁
@@ -98,9 +132,41 @@
     public UserEntity selectByUid(String uid);
 
     /**
-     * 鏌ヨ鍏ㄩ儴鏁版嵁
+     * 鏌ヨ鎵�鏈�
      *
      * @return
      */
     public List<UserEntity> selectUserAll();
+
+    /**
+     * 鏍规嵁瑙掕壊+鍗曚綅鏌ヨ璁板綍鏁�
+     *
+     * @param uname
+     * @param roleid
+     * @param depcode
+     * @return
+     */
+    public Integer selectCountForRole(String uname, Integer roleid, String depcode);
+
+    /**
+     * 鏍规嵁瑙掕壊+鍗曚綅鍒嗛〉鏌ヨ
+     *
+     * @param uname
+     * @param roleid
+     * @param depcode
+     * @param limit
+     * @param offset
+     * @return
+     */
+    public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset);
+
+    /**
+     * 鏇存柊澶氫釜鐢ㄦ埛瀵嗙爜
+     *
+     * @param updateUser
+     * @param pwd
+     * @param ids
+     * @return
+     */
+    public Integer updateUsersPwd(Integer updateUser, String pwd, List<Integer> ids);
 }
\ No newline at end of file

--
Gitblit v1.9.3