|
@@ -77,7 +77,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
vo.setRoles(roles);
|
|
vo.setRoles(roles);
|
|
|
vo.setFunctions(sysFunctionMapper.selectFunctionsBycondition(roleIdsList));
|
|
vo.setFunctions(sysFunctionMapper.selectFunctionsBycondition(roleIdsList));
|
|
|
}
|
|
}
|
|
|
- vo.setDeptName(departmentMapper.selectById(systemUser.getDeptId()).getDepartmentName());
|
|
|
|
|
|
|
+ Department department = departmentMapper.selectOne(new QueryWrapper<Department>().eq("department_guid", systemUser.getDeptId()));
|
|
|
|
|
+ vo.setDeptName(department.getDepartmentName());
|
|
|
msg.data = vo;
|
|
msg.data = vo;
|
|
|
} else {
|
|
} else {
|
|
|
msg.setError("密码错误");
|
|
msg.setError("密码错误");
|