diff --git a/backend/src/main/java/io/dataease/commons/constants/SystemConstants.java b/backend/src/main/java/io/dataease/commons/constants/SystemConstants.java
index f8ce4997c5..e474609ae8 100644
--- a/backend/src/main/java/io/dataease/commons/constants/SystemConstants.java
+++ b/backend/src/main/java/io/dataease/commons/constants/SystemConstants.java
@@ -14,6 +14,10 @@ public class SystemConstants {
}
+ public static final class PRIVILEGE_VALUE{
+ public final static Integer ON = 1;
+ public final static Integer OFF = 0;
+ }
}
diff --git a/backend/src/main/java/io/dataease/service/sys/SysAuthService.java b/backend/src/main/java/io/dataease/service/sys/SysAuthService.java
index 619a636bda..eb425c6b12 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysAuthService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysAuthService.java
@@ -91,14 +91,13 @@ public class SysAuthService {
});
});
// 授权修改
- extSysAuthDetailMapper.authDetailsChange(sysAuthDetail.getPrivilegeValue(),sysAuthDetail.getPrivilegeType(),authIdChange);
-// if(sysAuthDetail.getPrivilegeValue()==SystemConstants.PRIVILEGE_VALUE_ON){
-// //当前为开启1 >>> 关闭0 需要将权限级别（PrivilegeType）大于当前级别的全新都修改为关闭 0
-// extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_OFF,sysAuthDetail.getPrivilegeType(),authIdChange);
-// }else{
-// //当前为关闭0 >>> 开启1 需要将权限级别（PrivilegeType）小于当前级别的全新都修改为开启 1
-// extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_ON,sysAuthDetail.getPrivilegeType(),authIdChange);
-// }
+ if(sysAuthDetail.getPrivilegeValue()==SystemConstants.PRIVILEGE_VALUE.ON){
+ //当前为开启1 >>> 关闭0 需要将权限级别（PrivilegeType）大于当前级别的全新都修改为关闭 0
+ extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE.OFF,sysAuthDetail.getPrivilegeType(),authIdChange);
+ }else{
+ //当前为关闭0 >>> 开启1 需要将权限级别（PrivilegeType）小于当前级别的全新都修改为开启 1
+ extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE.ON,sysAuthDetail.getPrivilegeType(),authIdChange);
+ }
}
}
diff --git a/frontend/src/icons/svg/lock_closed.svg b/frontend/src/icons/svg/lock_closed.svg
index 5bde6cd099..dca1104b21 100644
--- a/frontend/src/icons/svg/lock_closed.svg
+++ b/frontend/src/icons/svg/lock_closed.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/frontend/src/icons/svg/lock_open.svg b/frontend/src/icons/svg/lock_open.svg
index 0c2ec990b3..ba982c4e48 100644
--- a/frontend/src/icons/svg/lock_open.svg
+++ b/frontend/src/icons/svg/lock_open.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue
index 179ab2b0f9..e59b2ffc7e 100644
--- a/frontend/src/views/system/authority/components/LazyTree.vue
+++ b/frontend/src/views/system/authority/components/LazyTree.vue
@@ -18,23 +18,26 @@
@node-click="nodeClick"
>
-
-
+
+
-
@@ -91,8 +94,6 @@ export default {
},
authDetails: {},
defaultAuthDetails: [],
- // 刷新 解决 authDetails 对象改变 authDetails[id] 报错的情况
- authReady: false,
searchStatus: false, // 当前是否在搜索状态 （搜索状态 展开不加载子节点）
// 当前已经加载的节点ID 备用（当前把当前authTarget的所有授权加载进来）
loadedNodeIds: new Set()
@@ -133,7 +134,6 @@ export default {
loadAuth() {
if (this.authCondition && this.showExtent) {
debugger
- this.authReady = false
let authQueryCondition = {}
if (this.dataInfo.direction === 'source') {
// 当前为授权数据 获取当前authTarget 的授权信息 authSource
@@ -149,7 +149,6 @@ export default {
}
authDetails(authQueryCondition).then(res => {
this.authDetails = res.data
- this.authReady = true
})
}
},
@@ -253,7 +252,6 @@ export default {
}
}
authChange(authChangeCondition).then(res => {
- this.authDetails = res.data
// 重新加载权限
this.loadAuth()
})
@@ -283,9 +281,8 @@ export default {
padding-left: 8px;
}
.tree-main{
- height: calc(100vh - 206px);
+ height: 100vh;
border: 1px solid #e6e6e6;
- overflow-y: auto;
}
.tree-head{
height: 30px;
@@ -305,17 +302,4 @@ export default {
color: #faaa39 !important;
}
- >>>.el-switch__core{
- width:30px!important;
- height:13px;
- /*color:#409EFF;*/
- }
- /*设置圆*/
- >>>.el-switch__core::after{
- width:13px;
- height:13px;
- margin-top:-2px;
- margin-bottom: 2px;
- }
-