From a65c28707599e31689cca650dde5bb40546bc2f8 Mon Sep 17 00:00:00 2001 From: HaoRan <418836876@qq.com> Date: Mon, 31 Aug 2020 02:10:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DEditor=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AF=B9=E5=93=8D=E5=BA=94=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0null=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/Editor/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue index 6eb2687f..162d240b 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); } } }, From 3fd9147afb374e7b3ac031aceaca67cef8f6ef3c Mon Sep 17 00:00:00 2001 From: dawn Date: Wed, 2 Sep 2020 10:14:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E2=80=9C=E5=9C=A8?= =?UTF-8?q?=E5=8F=AA=E5=A1=AB=E5=8A=A0=E4=BA=86=E5=AD=97=E5=85=B8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=BC=93=E5=AD=98=E4=BA=86=E7=A9=BA=E9=9B=86=E5=90=88?= =?UTF-8?q?=EF=BC=8C=E5=8D=B3=E4=BD=BF=E5=90=8E=E8=BE=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E4=B9=9F=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=B8=85=E7=A9=BAredis?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E3=80=82=E2=80=9D=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=B0=8F=E9=97=AE=E9=A2=98=E5=B0=B1=E6=98=AF=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E7=A8=8D=E7=A8=8D=E6=94=B9=E4=BA=86=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=A4=A7=E5=A4=A7=E8=AE=A9=E6=88=91pr?= =?UTF-8?q?=E5=BD=93=E4=B8=AA=E8=B4=A1=E7=8C=AE=E8=80=85=EF=BC=8C=E5=BE=88?= =?UTF-8?q?=E8=8D=A3=E5=B9=B8=E5=BE=88=E6=AC=A3=E6=85=B0=E3=80=82=E6=84=9F?= =?UTF-8?q?=E8=B0=A2=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c38951bc..8705c412 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 (null!=dictDatas&&!dictDatas.isEmpty()) { return dictDatas; } dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (StringUtils.isNotNull(dictDatas)) + if (null!=dictDatas&&!dictDatas.isEmpty()) { DictUtils.setDictCache(dictType, dictDatas); return dictDatas; From 0a51f7d743ec0459726368fb65fc2af9813239f6 Mon Sep 17 00:00:00 2001 From: tzg Date: Wed, 2 Sep 2020 14:55:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 3 +++ 1 file changed, 3 insertions(+) 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 222888cf..80c1fda0 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,6 +79,9 @@ public class DataScopeAspect } // 获取当前的用户 LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); + if (loginUser == null) { + return; + } SysUser currentUser = loginUser.getUser(); if (currentUser != null) { From 50ac363682595f6d0bcca3e68e0bea6af9617aaa Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 4 Sep 2020 14:47:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7druid=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=ACv1.1.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../com/ruoyi/framework/aspectj/DataScopeAspect.java | 9 +++------ .../system/service/impl/SysDictTypeServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 9ef7c4fd..4302e8cb 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 80c1fda0..a796f841 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,14 +79,11 @@ public class DataScopeAspect } // 获取当前的用户 LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); - if (loginUser == null) { - return; - } - 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 8705c412..2db4341b 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 (null!=dictDatas&&!dictDatas.isEmpty()) + if (StringUtils.isNotEmpty(dictDatas)) { return dictDatas; } dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (null!=dictDatas&&!dictDatas.isEmpty()) + if (StringUtils.isNotEmpty(dictDatas)) { DictUtils.setDictCache(dictType, dictDatas); return dictDatas;