From 16d8b71e21dc7298b30f46bf264cd9b3589a6978 Mon Sep 17 00:00:00 2001
From: who's hu <hup_dev@outlook.com>
Date: 星期二, 22 八月 2023 17:25:19 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 由于重定向url存在 http://xxx.xx.xxx/{id}?param={a}&name={b} 的场景, 当未登录访问时, 通过改js封装登录后重定向参数, 会丢失?后的query params 如: 访问 http://localhost:1024/core/doc/doc?id=1683734914907807745&version=31 期望 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745%26version%3D31 实际通过 to.fullPath 封装后 获得 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745&version=31
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
index 39d9505..de244f8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -60,32 +60,33 @@
* 批量删除字典数据信息
*
* @param dictCodes 需要删除的字典数据ID
- * @return 结果
*/
@Override
- public int deleteDictDataByIds(Long[] dictCodes)
+ public void deleteDictDataByIds(Long[] dictCodes)
{
- int row = dictDataMapper.deleteDictDataByIds(dictCodes);
- if (row > 0)
+ for (Long dictCode : dictCodes)
{
- DictUtils.clearDictCache();
+ SysDictData data = selectDictDataById(dictCode);
+ dictDataMapper.deleteDictDataById(dictCode);
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+ DictUtils.setDictCache(data.getDictType(), dictDatas);
}
- return row;
}
/**
* 新增保存字典数据信息
*
- * @param dictData 字典数据信息
+ * @param data 字典数据信息
* @return 结果
*/
@Override
- public int insertDictData(SysDictData dictData)
+ public int insertDictData(SysDictData data)
{
- int row = dictDataMapper.insertDictData(dictData);
+ int row = dictDataMapper.insertDictData(data);
if (row > 0)
{
- DictUtils.clearDictCache();
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+ DictUtils.setDictCache(data.getDictType(), dictDatas);
}
return row;
}
@@ -93,16 +94,17 @@
/**
* 修改保存字典数据信息
*
- * @param dictData 字典数据信息
+ * @param data 字典数据信息
* @return 结果
*/
@Override
- public int updateDictData(SysDictData dictData)
+ public int updateDictData(SysDictData data)
{
- int row = dictDataMapper.updateDictData(dictData);
+ int row = dictDataMapper.updateDictData(data);
if (row > 0)
{
- DictUtils.clearDictCache();
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+ DictUtils.setDictCache(data.getDictType(), dictDatas);
}
return row;
}
--
Gitblit v1.9.2