From 220a4f9b7e86316818d324864c2bc501b2b9dfbf Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 08 四月 2021 22:28:11 +0800
Subject: [PATCH] 用户&角色单条删除时使其逻辑删除
---
src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java | 6 +++---
src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 10 +++++-----
src/main/resources/mybatis/system/SysUserMapper.xml | 2 +-
src/main/resources/mybatis/system/SysRoleMapper.xml | 6 +-----
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
index b40078c..1b6ee2d 100644
--- a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -78,9 +78,9 @@
}
// 鍞竴鏍囪瘑锛堟寚瀹歬ey + 娑堟伅澶达級
- String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + submitKey;
+ String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
- Object sessionObj = redisCache.getCacheObject(cache_repeat_key);
+ Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
if (sessionObj != null)
{
Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
@@ -95,7 +95,7 @@
}
Map<String, Object> cacheMap = new HashMap<String, Object>();
cacheMap.put(url, nowDataMap);
- redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS);
+ redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
return false;
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index bd8f988..a2f1e17 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -158,7 +158,7 @@
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();
@@ -321,7 +321,7 @@
{
String routerName = StringUtils.capitalize(menu.getPath());
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
- if (isMeunFrame(menu))
+ if (isMenuFrame(menu))
{
routerName = StringUtils.EMPTY;
}
@@ -344,7 +344,7 @@
routerPath = "/" + menu.getPath();
}
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級
- else if (isMeunFrame(menu))
+ else if (isMenuFrame(menu))
{
routerPath = "/";
}
@@ -360,7 +360,7 @@
public String getComponent(SysMenu menu)
{
String component = UserConstants.LAYOUT;
- if (StringUtils.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
+ if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
{
component = menu.getComponent();
}
@@ -377,7 +377,7 @@
* @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);
diff --git a/src/main/resources/mybatis/system/SysRoleMapper.xml b/src/main/resources/mybatis/system/SysRoleMapper.xml
index a5c95fe..2e96e2d 100644
--- a/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -135,12 +135,8 @@
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">
diff --git a/src/main/resources/mybatis/system/SysUserMapper.xml b/src/main/resources/mybatis/system/SysUserMapper.xml
index 8825af7..4b6807d 100644
--- a/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -169,7 +169,7 @@
</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">
--
Gitblit v1.9.3