lbqms.git - Gitblit

			@@ -7,6 +7,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import lombok.RequiredArgsConstructor;
			import org.dromara.common.core.constant.UserConstants;
			import org.dromara.common.core.utils.MapstructUtils;
			import org.dromara.common.core.utils.StreamUtils;
			@@ -26,7 +27,6 @@
			import org.dromara.system.mapper.SysRoleMenuMapper;
			import org.dromara.system.mapper.SysTenantPackageMapper;
			import org.dromara.system.service.ISysMenuService;
			import lombok.RequiredArgsConstructor;
			import org.springframework.stereotype.Service;

			import java.util.*;
			@@ -75,7 +75,7 @@
			.orderByAsc(SysMenu::getOrderNum));
			} else {
			QueryWrapper<SysMenu> wrapper = Wrappers.query();
			wrapper.eq("sur.user_id", userId)
			wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId)
			.like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
			.eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
			.eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
			@@ -169,11 +169,11 @@
			if (tenantPackage.getMenuCheckStrictly()) {
			parentIds = baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
			.select(SysMenu::getParentId)
			.in(SysMenu::getMenuId, menuIds), Convert::toLong);
			.in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);});
			}
			return baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
			.in(SysMenu::getMenuId, menuIds)
			.notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), Convert::toLong);
			.notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);});
			}

			/**