lbqms.git - Gitblit

			@@ -25,15 +25,10 @@
			import org.dromara.common.tenant.helper.TenantHelper;
			import org.dromara.system.domain.SysUser;
			import org.dromara.system.domain.bo.SysSocialBo;
			import org.dromara.system.domain.vo.SysRoleVo;
			import org.dromara.system.domain.vo.SysSocialVo;
			import org.dromara.system.domain.vo.SysTenantVo;
			import org.dromara.system.domain.vo.SysUserVo;
			import org.dromara.system.domain.vo.*;
			import org.dromara.system.mapper.SysDeptMapper;
			import org.dromara.system.mapper.SysUserMapper;
			import org.dromara.system.service.ISysPermissionService;
			import org.dromara.system.service.ISysRoleService;
			import org.dromara.system.service.ISysSocialService;
			import org.dromara.system.service.ISysTenantService;
			import org.dromara.system.service.*;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			@@ -62,6 +57,7 @@
			private final ISysPermissionService permissionService;
			private final ISysSocialService sysSocialService;
			private final ISysRoleService roleService;
			private final ISysDeptService deptService;
			private final SysUserMapper userMapper;


			@@ -149,10 +145,9 @@
			loginUser.setUserType(user.getUserType());
			loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
			loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
			loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
			List<SysRoleVo> roles = DataPermissionHelper.ignore(() -> {
			return roleService.selectRolesByUserId(user.getUserId());
			});
			SysDeptVo dept = deptService.selectDeptById(user.getDeptId());
			loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
			List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId());
			loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
			return loginUser;
			}