From fe65bb1d764ca9d32647818240bb551db06e0b7c Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 30 六月 2025 15:50:04 +0800 Subject: [PATCH] 设备车间管理与用户 --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 106de85..96ad5de 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -48,7 +48,7 @@ @Service @Slf4j public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService { - + @Autowired private SysUserMapper userMapper; @Autowired @@ -141,8 +141,8 @@ public SysUser getUserByName(String username) { return userMapper.getUserByName(username); } - - + + @Override @Transactional(rollbackFor = Exception.class) public void addUserWithRole(SysUser user, String roles) { @@ -203,7 +203,7 @@ roleIndex = list.get(0); } } - + //濡傛灉componentUrl涓虹┖锛屽垯杩斿洖绌� if(oConvertUtils.isEmpty(roleIndex.getComponent())){ return null; @@ -269,7 +269,7 @@ info.setSysUserName(sysUser.getRealname()); info.setSysOrgCode(sysUser.getOrgCode()); } - + //澶氶儴闂ㄦ敮鎸乮n鏌ヨ List<SysDepart> list = sysDepartMapper.queryUserDeparts(sysUser.getId()); List<String> sysMultiOrgCode = new ArrayList<String>(); @@ -285,7 +285,7 @@ } } info.setSysMultiOrgCode(sysMultiOrgCode); - + return info; } @@ -355,6 +355,16 @@ @Override public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) { return userMapper.getUserByRoleId(page,roleId,username); + } + + /** + * 鏍规嵁璁惧杞﹂棿绠$悊Id鏌ヨ + * @param page + * @param workShopDepartId 璁惧杞﹂棿绠$悊Id + * @return + */ + public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId){ + return userMapper.getUserByWorkShopDepartId(page,workShopDepartId); } @@ -707,6 +717,14 @@ } /** + * 鏍规嵁瑙掕壊缂栫爜鍒楄〃鏌ヨ鐢ㄦ埛id闆嗗悎 + */ + @Override + public List<SysUser> getUserByRoleCodeList(List<String> roleCodeList) { + return this.baseMapper.getUserByRoleCodeList(roleCodeList); + } + + /** * 鏍规嵁瑙掕壊缂栫爜鍜岃澶囩紪鍙锋煡璇㈢敤鎴� */ @Override -- Gitblit v1.9.3