jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
This commit is contained in:
疯狂的狮子li
2021-04-08 17:12:13 +08:00
parent 1d3a361a66 b56b8846d9
commit 8b37eca241
6 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -154,7 +154,7 @@ public class SysMenuServiceImpl implements ISysMenuService
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
}
else if (isMeunFrame(menu))
else if (isMenuFrame(menu))
{
List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo();
@ -317,7 +317,7 @@ public class SysMenuServiceImpl implements ISysMenuService
{
String routerName = StrUtil.upperFirst(menu.getPath());
// 非外链并且是一级目录（类型为目录）
if (isMeunFrame(menu))
if (isMenuFrame(menu))
{
routerName = StrUtil.EMPTY;
}
@ -340,7 +340,7 @@ public class SysMenuServiceImpl implements ISysMenuService
routerPath = "/" + menu.getPath();
}
// 非外链并且是一级目录（类型为菜单）
else if (isMeunFrame(menu))
else if (isMenuFrame(menu))
{
routerPath = "/";
}
@ -356,7 +356,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public String getComponent(SysMenu menu)
{
String component = UserConstants.LAYOUT;
if (StrUtil.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
{
component = menu.getComponent();
}
@ -373,7 +373,7 @@ public class SysMenuServiceImpl implements ISysMenuService
* @param menu 菜单信息
* @return 结果
*/
public boolean isMeunFrame(SysMenu menu)
public boolean isMenuFrame(SysMenu menu)
{
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
&& menu.getIsFrame().equals(UserConstants.NO_FRAME);
@ -381,7 +381,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* 是否为parent_view组件
*
*
* @param menu 菜单信息
* @return 结果
*/

8
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -134,13 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set>
where role_id = #{roleId}
</update>
<update id="updateRoleStatus" parameterType="SysRole">
update sys_user set status = #{status} where user_id = #{userId}
</update>
<delete id="deleteRoleById" parameterType="Long">
delete from sys_role where role_id = #{roleId}
update sys_role set del_flag = '2' where role_id = #{roleId}
</delete>
<delete id="deleteRoleByIds" parameterType="Long">

2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteUserById" parameterType="Long">
delete from sys_user where user_id = #{userId}
update sys_user set del_flag = '2' where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">