wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
View File

@ -79,9 +79,9 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
} }
// 唯一标识（指定key + 消息头） // 唯一标识（指定key + 消息头）
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) if (sessionObj != null)
{ {
Map<String, Object> sessionMap = (Map<String, Object>) sessionObj; Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
@ -96,7 +96,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
} }
Map<String, Object> cacheMap = new HashMap<String, Object>(); Map<String, Object> cacheMap = new HashMap<String, Object>();
cacheMap.put(url, nowDataMap); cacheMap.put(url, nowDataMap);
redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS); redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
return false; return false;
} }

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.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus)); router.setChildren(buildMenus(cMenus));
} }
else if (isMeunFrame(menu)) else if (isMenuFrame(menu))
{ {
List<RouterVo> childrenList = new ArrayList<RouterVo>(); List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo(); RouterVo children = new RouterVo();
@ -317,7 +317,7 @@ public class SysMenuServiceImpl implements ISysMenuService
{ {
String routerName = StrUtil.upperFirst(menu.getPath()); String routerName = StrUtil.upperFirst(menu.getPath());
// 非外链并且是一级目录（类型为目录） // 非外链并且是一级目录（类型为目录）
if (isMeunFrame(menu)) if (isMenuFrame(menu))
{ {
routerName = StrUtil.EMPTY; routerName = StrUtil.EMPTY;
} }
@ -340,7 +340,7 @@ public class SysMenuServiceImpl implements ISysMenuService
routerPath = "/" + menu.getPath(); routerPath = "/" + menu.getPath();
} }
// 非外链并且是一级目录（类型为菜单） // 非外链并且是一级目录（类型为菜单）
else if (isMeunFrame(menu)) else if (isMenuFrame(menu))
{ {
routerPath = "/"; routerPath = "/";
} }
@ -356,7 +356,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public String getComponent(SysMenu menu) public String getComponent(SysMenu menu)
{ {
String component = UserConstants.LAYOUT; String component = UserConstants.LAYOUT;
if (StrUtil.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu)) if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
{ {
component = menu.getComponent(); component = menu.getComponent();
} }
@ -373,7 +373,7 @@ public class SysMenuServiceImpl implements ISysMenuService
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @return 结果
*/ */
public boolean isMeunFrame(SysMenu menu) public boolean isMenuFrame(SysMenu menu)
{ {
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
&& menu.getIsFrame().equals(UserConstants.NO_FRAME); && menu.getIsFrame().equals(UserConstants.NO_FRAME);
@ -381,7 +381,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/** /**
* 是否为parent_view组件 * 是否为parent_view组件
* *
* @param menu 菜单信息 * @param menu 菜单信息
* @return 结果 * @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> </set>
where role_id = #{roleId} where role_id = #{roleId}
</update> </update>
<update id="updateRoleStatus" parameterType="SysRole">
update sys_user set status = #{status} where user_id = #{userId}
</update>
<delete id="deleteRoleById" parameterType="Long"> <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>
<delete id="deleteRoleByIds" parameterType="Long"> <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> </update>
<delete id="deleteUserById" parameterType="Long"> <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>
<delete id="deleteUserByIds" parameterType="Long"> <delete id="deleteUserByIds" parameterType="Long">

1
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -106,7 +106,6 @@
} }
.el-table .fixed-width .el-button--mini { .el-table .fixed-width .el-button--mini {
color: #409EFF;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: inherit; width: inherit;

2
ruoyi-ui/src/utils/zipdownload.js
View File

@ -36,5 +36,5 @@ export function resolveBlob(res, mimeType) {
aLink.setAttribute('download', fileName) // 设置下载文件名称 aLink.setAttribute('download', fileName) // 设置下载文件名称
document.body.appendChild(aLink) document.body.appendChild(aLink)
aLink.click() aLink.click()
document.body.appendChild(aLink) document.body.removeChild(aLink);
} }