From 093579c99049bf09ecf8e5d0f80179fde1ddc776 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 10 七月 2024 09:49:31 +0800
Subject: [PATCH] 下片：下片任务状态字段名称修改 大理片：1、扫码任务新增确认字校验：确认字为0，请求有id的情况不处理 2、新增定时任务处理进出片任务执行过程中出现破损玻璃的情况 待完成：破损表新增功能未实现
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
index b4d0fc6..597f93c 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
@@ -61,13 +61,15 @@
MPJLambdaWrapper<SysUserRole> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(SysMenu.class).distinct()
- .leftJoin(SysUser.class, SysUser::getId, SysUserRole::getUserId)
- .leftJoin(SysRoleMenu.class, SysRoleMenu::getRoleId, SysUserRole::getRoleId)
- .leftJoin(SysMenu.class, SysMenu::getId, SysRoleMenu::getMenuId)
+ .innerJoin(SysUser.class, SysUser::getId, SysUserRole::getUserId)
+ .innerJoin(SysRoleMenu.class, SysRoleMenu::getRoleId, SysUserRole::getRoleId)
+ .innerJoin(SysMenu.class, SysMenu::getId, SysRoleMenu::getMenuId)
.eq(SysUser::getId, user.getId())
.like(StringUtils.isNotBlank(request.getKey()), SysMenu::getMenuName, request.getKey());
+ //
List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
+ log.info("userinfos:{}",menuList);
return create(menuList);
}
--
Gitblit v1.8.0