From c478333af1883ebb7ba359dc0a1756c2ed2b0927 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 七月 2025 17:23:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index 7966336..a00919a 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.vo.EamUserRepDepVo;
import org.jeecg.modules.system.vo.MdcUserProVo;
import org.jeecg.modules.system.vo.SysUserDepVo;
@@ -62,22 +63,30 @@
* @return
*/
IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
-
+
+ /**
+ * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
+ * @param page
+ * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @return
+ */
+ IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("baseFactoryId") String baseFactoryId, @Param("username") String username);
+
/**
* 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
* @param username
* @param orgCode
*/
void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode);
-
+
/**
* 鏍规嵁鎵嬫満鍙锋煡璇㈢敤鎴蜂俊鎭�
* @param phone
* @return
*/
public SysUser getUserByPhone(@Param("phone") String phone);
-
-
+
+
/**
* 鏍规嵁閭鏌ヨ鐢ㄦ埛淇℃伅
* @param email
@@ -150,7 +159,7 @@
*/
@Deprecated
int updateNullByEmptyString(@Param("fieldName") String fieldName);
-
+
/**
* 鏍规嵁閮ㄩ棬Ids,鏌ヨ閮ㄩ棬涓嬬敤鎴蜂俊鎭�
* @param departIds
@@ -183,4 +192,11 @@
* 鏍规嵁瑙掕壊缂栫爜鍜岃澶囩紪鍙锋煡璇㈢敤鎴�
*/
List<SysUser> getEquipmentAdmin(@Param("roleCode") String roleCode, @Param("equipmentId") String equipmentId);
+
+ List<SysUser> getUserByRoleCodeList(@Param("roleCodeList") List<String> roleCodeList);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛Ids,鏌ヨ鐢ㄦ埛鎵�灞炵淮淇儴闂ㄥ悕绉颁俊鎭�
+ */
+ List<EamUserRepDepVo> getRepDepNamesByUserIds(@Param("userIds") List<String> userIds);
}
--
Gitblit v1.9.3