Browse Source

解决常用菜单未查询自己菜单的问题

dzx 1 year ago
parent
commit
2973938ec2

+ 4 - 0
src/main/java/com/xjrsoft/module/system/controller/SystemMenuCommonlyUsedController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.system.controller;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -60,6 +61,7 @@ public class SystemMenuCommonlyUsedController {
         LambdaQueryWrapper<SystemMenuCommonlyUsed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                     .orderByDesc(SystemMenuCommonlyUsed::getId)
+                .eq(SystemMenuCommonlyUsed::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .select(SystemMenuCommonlyUsed.class,x -> VoToColumnUtil.fieldsToColumns(SystemMenuCommonlyUsedPageVo.class).contains(x.getProperty()));
         IPage<SystemMenuCommonlyUsed> page = systemMenuCommonlyUsedService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<SystemMenuCommonlyUsedPageVo> pageOutput = ConventPage.getPageOutput(page, SystemMenuCommonlyUsedPageVo.class);
@@ -79,9 +81,11 @@ public class SystemMenuCommonlyUsedController {
                 .select("t1.path",SystemMenuCommonlyUsedPageVo::getPath)
                 .select("t1.remark",SystemMenuCommonlyUsedPageVo::getRemark)
                 .select("t1.title",SystemMenuCommonlyUsedPageVo::getTitle)
+                .eq(SystemMenuCommonlyUsed::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .leftJoin("xjr_menu t1 on t1.id = t.menu_id");
 
 
+
         List<SystemMenuCommonlyUsedPageVo> dataList = systemMenuCommonlyUsedService.selectJoinList(SystemMenuCommonlyUsedPageVo.class,queryWrapper);
         // List<SystemMenuCommonlyUsedPageVo> treeVoList = TreeUtil.build(dataList);