From 8b37eca24180ea35052bba0538e18b86d1c945e0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 08 四月 2021 17:12:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/zipdownload.js | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java | 6 +++---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 12 ++++++------
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 8 ++------
ruoyi-ui/src/assets/styles/ruoyi.scss | 1 -
6 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
index e3c7ee5..60bbf7c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -79,9 +79,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;
@@ -96,7 +96,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/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 c013928..1af67d2 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
@@ -154,7 +154,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();
@@ -317,7 +317,7 @@
{
String routerName = StrUtil.upperFirst(menu.getPath());
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
- if (isMeunFrame(menu))
+ if (isMenuFrame(menu))
{
routerName = StrUtil.EMPTY;
}
@@ -340,7 +340,7 @@
routerPath = "/" + menu.getPath();
}
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級
- else if (isMeunFrame(menu))
+ else if (isMenuFrame(menu))
{
routerPath = "/";
}
@@ -356,7 +356,7 @@
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 @@
* @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 @@
/**
* 鏄惁涓簆arent_view缁勪欢
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 缁撴灉
*/
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 3506de8..bd15a91 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -134,13 +134,9 @@
</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">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 296912d..c996a5e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/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">
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index b1a1661..de1db7f 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -106,7 +106,6 @@
}
.el-table .fixed-width .el-button--mini {
- color: #409EFF;
padding-left: 0;
padding-right: 0;
width: inherit;
diff --git a/ruoyi-ui/src/utils/zipdownload.js b/ruoyi-ui/src/utils/zipdownload.js
index 363c45a..fff4873 100644
--- a/ruoyi-ui/src/utils/zipdownload.js
+++ b/ruoyi-ui/src/utils/zipdownload.js
@@ -36,5 +36,5 @@
aLink.setAttribute('download', fileName) // 璁剧疆涓嬭浇鏂囦欢鍚嶇О
document.body.appendChild(aLink)
aLink.click()
- document.body.appendChild(aLink)
+ document.body.removeChild(aLink);
}
--
Gitblit v1.9.3