diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java index 7ffebf14..0b5711da 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java @@ -27,4 +27,6 @@ public class UserModel { * 登录名 */ private String deptId; + + private String dId; } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index c6f0ed6f..9cb0938b 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -359,22 +359,19 @@ public class SysUserServiceImpl extends ServiceImpl i for(UserModel model : models) { if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) { userModels.add(model); + + if(model.getDeptId().equals(model.getDId())){ + UserModel userModel = new UserModel(); + userModel.setUserId(model.getUserId()); + userModel.setLoginname(model.getLoginname()); + userModel.setUsername(model.getUsername()); + userModel.setDeptId(model.getDId()); + userModels.add(userModel); + } } } } -// //增加当前登录用户选中的数据 -// for (SysDeptEntity entity : deptEntities){ -// UserModel userModel = new UserModel(); -// userModel.setUserId(String.valueOf(user.getUserId())); -// userModel.setUsername(user.getUsername()); -// userModel.setLoginname(user.getLoginname()); -// userModel.setDeptId(String.valueOf(entity.getDeptId())); -// if(userModels.stream().noneMatch(e -> userModel.getUserId().equals(e.getUserId()) && userModel.getDeptId().equals(e.getDeptId()) )) { -// userModels.add(userModel); -// } -// } - log.info("userModels={}",userModels); user.setUserModels(userModels); // 刷新菜单缓存处理 diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml index 07263dee..c9037f46 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml @@ -63,7 +63,8 @@ u.user_id, u.username, u.loginname, - u.dept_id + u.dept_id, + d.dept_id as dId FROM sys_user u WHERE u.company = #{company}