From 0a3a59432a0ff8d4169ad7484250a0a0d5bed1f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:50:58 +0800
Subject: [PATCH] # 1. 波次预览重复问题 2. PDA组拖超过3个物料后，组拖按钮被遮挡 3. 平库入库物料ID为空 4. PDA出库成功后，界面数据重置，避免重复操作 5. 入库单历史档，按时间倒序排列
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleMenuServiceImpl.java | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleMenuServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleMenuServiceImpl.java
index f3675af..6a16ab9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleMenuServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleMenuServiceImpl.java
@@ -1,25 +1,31 @@
-package com.zy.asrs.wms.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wms.system.entity.Menu;
-import com.zy.asrs.wms.system.entity.RoleMenu;
-import com.zy.asrs.wms.system.mapper.RoleMenuMapper;
-import com.zy.asrs.wms.system.service.RoleMenuService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("roleMenuService")
-public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> implements RoleMenuService {
-
- @Override
- public List<Menu> listMenuByUserId(Long userId, Integer menuType) {
- return baseMapper.listMenuByUserId(userId, menuType);
- }
-
- @Override
- public List<Long> listStrictlyMenuByRoleId(Long roleId) {
- return baseMapper.listStrictlyMenuByRoleId(roleId);
- }
-
-}
+package com.zy.asrs.wms.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.system.entity.Menu;
+import com.zy.asrs.wms.system.entity.RoleMenu;
+import com.zy.asrs.wms.system.mapper.RoleMenuMapper;
+import com.zy.asrs.wms.system.service.RoleMenuService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service("roleMenuService")
+public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> implements RoleMenuService {
+
+ @Override
+ public List<Menu> listMenuByUserId(Long userId, Integer menuType) {
+ return baseMapper.listMenuByUserId(userId, menuType, null);
+ }
+
+ @Override
+ public List<Menu> listMenuByUserId(Long userId, Integer menuType, Long hostId) {
+ return baseMapper.listMenuByUserId(userId, menuType, hostId);
+ }
+
+ @Override
+ public List<Long> listStrictlyMenuByRoleId(Long roleId) {
+ return baseMapper.listStrictlyMenuByRoleId(roleId);
+ }
+
+}
--
Gitblit v1.9.1