From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java | 7 ++++---
1 files changed, 4 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 f439b06..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,14 +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