From 2a30092c6e1efa28b5ca29a1b518356a08b4044c Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 03 七月 2025 15:06:25 +0800 Subject: [PATCH] 修改设备台账 --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 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 0f15266..cf414ed 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 @@ -10,6 +10,7 @@ import org.jeecg.modules.system.entity.SysRoleIndex; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; +import org.jeecg.modules.system.vo.UserSelector; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; @@ -166,10 +167,10 @@ /** * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ * @param page - * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id + * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id * @return */ - public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId); + public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username); /** @@ -332,4 +333,21 @@ List<SysUser> getUserByRoleCodeList(List<String> roleCodeList); List<SysUser> getEquipmentAdmin(String roleCode, String equipmentId); + + /** + * 閫夋嫨鐢ㄦ埛 + * @param equipmentCode 閫夋嫨鐨勮澶嘔D + * @param productionId 閫夋嫨鐨勮溅闂碔D + * @param positionCode 宀椾綅缂栧彿 + * @return + */ + List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode); + + /** + * 閫夋嫨鐢ㄦ埛 + * @param positionCode 宀椾綅缂栧彿 + * @return + */ + List<UserSelector> selectOperatorList( String positionCode); + } -- Gitblit v1.9.3