From f605b84620bf35bb02a2ee5ef2086c164b520e67 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 16 一月 2026 16:16:36 +0800
Subject: [PATCH] 浪潮对接单点登录:MES制造执行系统功能迁移

---
 src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
index bb07335..b22215a 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
@@ -1,10 +1,14 @@
 package com.ruoyi.project.system.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.ruoyi.project.system.domain.SysUser;
+import org.springframework.beans.PropertyValues;
 
 /**
  * 鐢ㄦ埛琛� 鏁版嵁灞�
@@ -20,6 +24,22 @@
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
     public List<SysUser> selectUserList(SysUser sysUser);
+
+    /**
+     * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸查厤鐢ㄦ埛瑙掕壊鍒楄〃
+     * 
+     * @param user 鐢ㄦ埛淇℃伅
+     * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+     */
+    public List<SysUser> selectAllocatedList(SysUser user);
+
+    /**
+     * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+     * 
+     * @param user 鐢ㄦ埛淇℃伅
+     * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+     */
+    public List<SysUser> selectUnallocatedList(SysUser user);
 
     /**
      * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -38,11 +58,20 @@
     public SysUser selectUserById(Long userId);
 
     /**
+     * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
+     *
+     * @param userId 鐢ㄦ埛ID
+     * @return 鐢ㄦ埛瀵硅薄淇℃伅
+     */
+    public List<SysUser> selectUserByIds(@Param("userIds") List<Long> userId);
+
+    /**
      * 鏂板鐢ㄦ埛淇℃伅
      * 
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int insertUser(SysUser user);
 
     /**
@@ -51,6 +80,7 @@
      * @param user 鐢ㄦ埛淇℃伅
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int updateUser(SysUser user);
 
     /**
@@ -60,6 +90,7 @@
      * @param avatar 澶村儚鍦板潃
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
@@ -69,6 +100,7 @@
      * @param password 瀵嗙爜
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
 
     /**
@@ -77,6 +109,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int deleteUserById(Long userId);
 
     /**
@@ -85,6 +118,7 @@
      * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
      * @return 缁撴灉
      */
+    @InterceptorIgnore(tenantLine = "true")
     public int deleteUserByIds(Long[] userIds);
 
     /**
@@ -93,7 +127,7 @@
      * @param userName 鐢ㄦ埛鍚嶇О
      * @return 缁撴灉
      */
-    public int checkUserNameUnique(String userName);
+    public SysUser checkUserNameUnique(String userName);
 
     /**
      * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
@@ -110,4 +144,8 @@
      * @return 缁撴灉
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectList(List<Long> registrantIds);
+
+    List<SysUser> selectUsersByIds(@Param("userIds") List<Long> userIds);
 }

--
Gitblit v1.9.3