diff --git a/pom.xml b/pom.xml
index 117ac332..db5536cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
UTF-8
1.8
1.3.2
- 1.1.14
+ 1.1.23
1.19
2.9.2
2.3.2
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 1e549e69..45d939bb 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -79,11 +79,11 @@ public class DataScopeAspect
}
// 获取当前的用户
LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
- SysUser currentUser = loginUser.getUser();
- if (currentUser != null)
+ if (StringUtils.isNotNull(loginUser))
{
+ SysUser currentUser = loginUser.getUser();
// 如果是超级管理员,则不过滤数据
- if (!currentUser.isAdmin())
+ if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
{
dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 76dab698..48ba3c62 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -76,12 +76,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
public List selectDictDataByType(String dictType)
{
List dictDatas = DictUtils.getDictCache(dictType);
- if (StringUtils.isNotNull(dictDatas))
+ if (StringUtils.isNotEmpty(dictDatas))
{
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
- if (StringUtils.isNotNull(dictDatas))
+ if (StringUtils.isNotEmpty(dictDatas))
{
DictUtils.setDictCache(dictType, dictDatas);
return dictDatas;
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index f60366ff..27088005 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -71,9 +71,9 @@ export default {
value: {
handler(val) {
if (val !== this.currentValue) {
- this.currentValue = val;
+ this.currentValue = val === null ? "" : val;
if (this.Quill) {
- this.Quill.pasteHTML(this.value);
+ this.Quill.pasteHTML(this.currentValue);
}
}
},
@@ -192,4 +192,4 @@ export default {
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
content: "等宽字体";
}
-
\ No newline at end of file
+