lbqms.git - Gitblit

			@@ -19,7 +19,10 @@
			import org.dromara.common.core.enums.TenantStatus;
			import org.dromara.common.core.exception.ServiceException;
			import org.dromara.common.core.exception.user.UserException;
			import org.dromara.common.core.utils.*;
			import org.dromara.common.core.utils.DateUtils;
			import org.dromara.common.core.utils.MessageUtils;
			import org.dromara.common.core.utils.SpringUtils;
			import org.dromara.common.core.utils.StringUtils;
			import org.dromara.common.log.event.LogininforEvent;
			import org.dromara.common.mybatis.helper.DataPermissionHelper;
			import org.dromara.common.redis.utils.RedisUtils;
			@@ -155,9 +158,11 @@
			loginUser.setUserType(user.getUserType());
			loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
			loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
			Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
			loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
			loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
			if (ObjectUtil.isNotNull(user.getDeptId())) {
			Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
			loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
			loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
			}
			List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId());
			loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
			return loginUser;

			@@ -2,6 +2,7 @@

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.util.ObjectUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import lombok.RequiredArgsConstructor;
			import org.dromara.common.core.utils.StreamUtils;
			@@ -38,6 +39,9 @@
			*/
			@Override
			public String getRoleCustom(Long roleId) {
			if (ObjectUtil.isNull(roleId)) {
			return "-1";
			}
			List<SysRoleDept> list = roleDeptMapper.selectList(
			new LambdaQueryWrapper<SysRoleDept>()
			.select(SysRoleDept::getDeptId)
			@@ -45,7 +49,7 @@
			if (CollUtil.isNotEmpty(list)) {
			return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
			}
			return null;
			return "-1";
			}

			/**
			@@ -56,6 +60,9 @@
			*/
			@Override
			public String getDeptAndChild(Long deptId) {
			if (ObjectUtil.isNull(deptId)) {
			return "-1";
			}
			List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
			.select(SysDept::getDeptId)
			.apply(DataBaseHelper.findInSet(deptId, "ancestors")));
			@@ -64,7 +71,7 @@
			if (CollUtil.isNotEmpty(ids)) {
			return StreamUtils.join(ids, Convert::toStr);
			}
			return null;
			return "-1";
			}

			}

	ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史