From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期三, 11 六月 2025 10:36:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 3604d3f..103f93a 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -221,7 +221,7 @@ * @param sysUser * @return */ - Result checkUserIsEffective(SysUser sysUser); + Result checkUserIsEffective(SysUser sysUser, String loginType); /** * 鏌ヨ琚�昏緫鍒犻櫎鐨勭敤鎴� @@ -332,6 +332,13 @@ List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode); /** + * 閫夋嫨鐢ㄦ埛 + * @param positionCode 宀椾綅缂栧彿 + * @return + */ + List<UserSelector> selectOperatorList( String positionCode); + + /** * 鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栫湡瀹炲鍚嶆槧灏� * @param userNames 鐢ㄦ埛鍚嶅垪琛� * @return 鐢ㄦ埛鍚�->鐪熷疄濮撳悕鐨勬槧灏勶紙涓嶅瓨鍦ㄦ椂鍊间负null锛� -- Gitblit v1.9.3