From d674d934e76f8a86ab8c0739812886c8301ff047 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 六月 2021 09:46:28 +0800
Subject: [PATCH] fix 修复上传路径 win 打包编译为 win 路径, linux 报错问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index aa924f9..6f7cc41 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
@@ -9,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.mapper.SysMenuMapper;
@@ -23,15 +25,12 @@
/**
* 鑿滃崟 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
-
- @Autowired
- private SysMenuMapper menuMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -61,10 +60,15 @@
List<SysMenu> menuList = null;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
if (SysUser.isAdmin(userId)) {
- menuList = menuMapper.selectMenuList(menu);
+ menuList = list(new LambdaQueryWrapper<SysMenu>()
+ .like(StrUtil.isNotBlank(menu.getMenuName()),SysMenu::getMenuName,menu.getMenuName())
+ .eq(StrUtil.isNotBlank(menu.getVisible()),SysMenu::getVisible,menu.getVisible())
+ .eq(StrUtil.isNotBlank(menu.getStatus()),SysMenu::getStatus,menu.getStatus())
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum));
} else {
menu.getParams().put("userId", userId);
- menuList = menuMapper.selectMenuListByUserId(menu);
+ menuList = baseMapper.selectMenuListByUserId(menu);
}
return menuList;
}
@@ -77,7 +81,7 @@
*/
@Override
public Set<String> selectMenuPermsByUserId(Long userId) {
- List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+ List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
if (Validator.isNotEmpty(perm)) {
@@ -97,9 +101,9 @@
public List<SysMenu> selectMenuTreeByUserId(Long userId) {
List<SysMenu> menus = null;
if (SecurityUtils.isAdmin(userId)) {
- menus = menuMapper.selectMenuTreeAll();
+ menus = baseMapper.selectMenuTreeAll();
} else {
- menus = menuMapper.selectMenuTreeByUserId(userId);
+ menus = baseMapper.selectMenuTreeByUserId(userId);
}
return getChildPerms(menus, 0);
}
@@ -112,8 +116,8 @@
*/
@Override
public List<Integer> selectMenuListByRoleId(Long roleId) {
- SysRole role = roleMapper.selectRoleById(roleId);
- return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
+ SysRole role = roleMapper.selectById(roleId);
+ return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
}
/**
@@ -138,6 +142,7 @@
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
} else if (isMenuFrame(menu)) {
+ router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
@@ -199,7 +204,7 @@
*/
@Override
public SysMenu selectMenuById(Long menuId) {
- return menuMapper.selectMenuById(menuId);
+ return getById(menuId);
}
/**
@@ -210,7 +215,7 @@
*/
@Override
public boolean hasChildByMenuId(Long menuId) {
- int result = menuMapper.hasChildByMenuId(menuId);
+ int result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId,menuId));
return result > 0 ? true : false;
}
@@ -222,7 +227,7 @@
*/
@Override
public boolean checkMenuExistRole(Long menuId) {
- int result = roleMenuMapper.checkMenuExistRole(menuId);
+ int result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId,menuId));
return result > 0 ? true : false;
}
@@ -234,7 +239,7 @@
*/
@Override
public int insertMenu(SysMenu menu) {
- return menuMapper.insertMenu(menu);
+ return baseMapper.insert(menu);
}
/**
@@ -245,7 +250,7 @@
*/
@Override
public int updateMenu(SysMenu menu) {
- return menuMapper.updateMenu(menu);
+ return baseMapper.updateById(menu);
}
/**
@@ -256,7 +261,7 @@
*/
@Override
public int deleteMenuById(Long menuId) {
- return menuMapper.deleteMenuById(menuId);
+ return baseMapper.deleteById(menuId);
}
/**
@@ -268,7 +273,10 @@
@Override
public String checkMenuNameUnique(SysMenu menu) {
Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
- SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
+ SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
+ .eq(SysMenu::getMenuName,menu.getMenuName())
+ .eq(SysMenu::getParentId,menu.getParentId())
+ .last("limit 1"));
if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
--
Gitblit v1.9.3