From 4e8dd706d568d1276ad82a0bf8f4ba13c5dac5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?0=E6=85=95=E5=AE=B9=E9=9B=AA0?= Date: Fri, 10 Mar 2023 08:22:35 +0000 Subject: [PATCH 1/8] =?UTF-8?q?update=20ruoyi-framework/src/main/java/com/?= =?UTF-8?q?ruoyi/framework/aspectj/DataScopeAspect.java.=20DataScopeAspect?= =?UTF-8?q?,=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=88=87=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B1=BB=E4=B8=AD=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=9A=E8=A7=92=E8=89=B2=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E8=8B=A5=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2=E9=83=BD=E4=B8=8D?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=BC=A0=E9=80=92=E8=BF=87=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=97=B6=E5=80=99sqlString=E4=B9=9F=E4=BC=9A=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E7=94=A8=E6=88=B7=E6=8B=A5?= =?UTF-8?q?=E6=9C=89=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E8=A6=81=E9=99=90=E5=88=B6=E4=B8=80?= =?UTF-8?q?=E4=B8=8B,=20=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AEconditions?= =?UTF-8?q?=E9=9B=86=E5=90=88=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E6=9D=A5=E5=88=A4=E6=96=AD=E5=BE=AA=E7=8E=AF=E6=97=B6=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=A7=92=E8=89=B2=E6=98=AF=E5=90=A6=E9=83=BD=E6=98=AF?= =?UTF-8?q?=E5=9C=A8=E5=88=A4=E6=96=AD=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=97=B6continue=E4=BA=86=E3=80=82=20=E5=A4=8D=E7=8E=B0?= =?UTF-8?q?=E6=96=B9=E6=B3=95:=20=E5=9C=A8=E4=BD=BF=E7=94=A8@DataScope?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=97=B6permission=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E4=BA=86=E5=80=BC,=E8=BF=99=E4=B8=AA=E5=80=BC=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=A7=92=E8=89=B2=E4=B8=8D=E5=8C=85=E5=90=AB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 0慕容雪0 --- .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 6 ++++++ 1 file changed, 6 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 6e4bc381..ddf5e60f 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 @@ -141,6 +141,12 @@ public class DataScopeAspect conditions.add(dataScope); } + // 多角色情况下，所有角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据 + if (StringUtils.isEmpty(conditions)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + if (StringUtils.isNotBlank(sqlString.toString())) { Object params = joinPoint.getArgs()[0]; From 7a090bda1eacb82cc8215735ca197a03274fcb6e Mon Sep 17 00:00:00 2001 From: Giovanni <8391690+giovanni_chien@user.noreply.gitee.com> Date: Fri, 10 Mar 2023 18:04:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BD=93=E5=89=8Dtab?= =?UTF-8?q?=E9=A1=B5=E5=BA=94=E8=B7=B3=E8=BD=AC=E6=9C=80=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?tab=E9=A1=B5=E8=80=8C=E9=9D=9E=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/plugins/tab.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js index 5e8b834a..60ceb5fa 100644 --- a/ruoyi-ui/src/plugins/tab.js +++ b/ruoyi-ui/src/plugins/tab.js @@ -32,8 +32,12 @@ export default { // 关闭指定tab页签 closePage(obj) { if (obj === undefined) { - return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => { - return router.push(lastPath || '/'); + return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => { + const latestView = visitedViews.slice(-1)[0] + if (latestView) { + return router.push(latestView.fullPath) + } + return router.push('/'); }); } return store.dispatch('tagsView/delView', obj); From 38ddefe2e67b1c8e006a9b9a8c4befdec11466b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=9F=E6=9B=BE=E4=B8=BA=E4=BD=A0=E5=83=8F=E8=B6=85?= =?UTF-8?q?=E4=BA=BA?= <1553592282@qq.com> Date: Sat, 11 Mar 2023 02:19:57 +0000 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E5=B8=83=E5=B1=80=E9=94=99=E4=B9=B1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 也曾为你像超人 <1553592282@qq.com> --- ruoyi-ui/src/assets/styles/transition.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/ruoyi-ui/src/assets/styles/transition.scss index a7129370..7e1b1036 100644 --- a/ruoyi-ui/src/assets/styles/transition.scss +++ b/ruoyi-ui/src/assets/styles/transition.scss @@ -18,10 +18,6 @@ transition: all .5s; } -.fade-transform-leave-active { - position: absolute; -} - .fade-transform-enter { opacity: 0; transform: translateX(-30px); From 628bc94a9a629d0b3330e90b6b065c72e25b5577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?0=E6=85=95=E5=AE=B9=E9=9B=AA0?= Date: Sat, 11 Mar 2023 04:31:55 +0000 Subject: [PATCH 4/8] update ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 0慕容雪0 --- .../main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ddf5e60f..c1c64ece 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 @@ -106,8 +106,9 @@ public class DataScopeAspect continue; } if (DATA_SCOPE_ALL.equals(dataScope)) - { + { sqlString = new StringBuilder(); + conditions.add(dataScope); break; } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) From dcb9cb3d135c5adc62931e2076bdabd2e9f22f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=85=83=E5=8D=9A?= <1553592282@qq.com> Date: Sat, 11 Mar 2023 14:42:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=90=8E=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=81=8F=E7=A7=BB=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/layout/components/AppMain.vue | 113 +++++----- ruoyi-ui/src/layout/index.vue | 232 +++++++++++---------- 2 files changed, 173 insertions(+), 172 deletions(-) diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue index 25d5a25a..b7a87ae8 100644 --- a/ruoyi-ui/src/layout/components/AppMain.vue +++ b/ruoyi-ui/src/layout/components/AppMain.vue @@ -1,61 +1,52 @@ - - - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 202cfcd6..ab2be3c4 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -1,111 +1,121 @@ - - - - - + + + + + From 4f02f3c6f7213aa39ca5c5e8afd7948033bedb36 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Mar 2023 14:13:39 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=9A=90=E8=97=8F=E5=B1=9E=E6=80=A7=E5=88=97=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=AD=90=E5=AF=B9=E8=B1=A1(I6GKPE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 3 ++- .../main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 1d4bfa35..4330d8fd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -1440,7 +1440,8 @@ public class ExcelUtil Excel[] excels = attrs.value(); for (Excel attr : excels) { - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr()) + && (attr != null && (attr.type() == Type.ALL || attr.type() == type))) { field.setAccessible(true); fields.add(new Object[] { field, attr }); 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 c1c64ece..35a6b50d 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 @@ -106,7 +106,7 @@ public class DataScopeAspect continue; } if (DATA_SCOPE_ALL.equals(dataScope)) - { + { sqlString = new StringBuilder(); conditions.add(dataScope); break; From ce7e12ec1db122aec022b7fd41b57b1c3dab2926 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 18 Mar 2023 09:31:26 +0800 Subject: [PATCH 7/8] delete build style --- ruoyi-ui/src/views/tool/build/index.vue | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue index d679422e..2bd298b8 100644 --- a/ruoyi-ui/src/views/tool/build/index.vue +++ b/ruoyi-ui/src/views/tool/build/index.vue @@ -371,20 +371,6 @@ export default { From cfce89be7d68708e05ce7901c604c904ee291363 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 18 Mar 2023 10:30:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=882.0.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79129216..60a1598e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 3.0.0 2.3.3 1.4.6 - 2.0.23 + 2.0.25 6.4.0 2.11.0 3.2.2