From e7a81853253d1a081ecdc8e1bd6455cf7eb426b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 27 Aug 2024 22:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directives/authSetup.js                  |  3 ---
 src/views/setting/advanced/index.vue         |  2 +-
 src/views/setting/company/add-permission.vue | 12 ++++++------
 src/views/setting/role/dataTree.vue          |  4 ++--
 src/views/setting/role/index.vue             |  2 +-
 src/views/setting/role/permission.vue        |  2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/directives/authSetup.js b/src/directives/authSetup.js
index fbcf956..c860db8 100644
--- a/src/directives/authSetup.js
+++ b/src/directives/authSetup.js
@@ -11,9 +11,6 @@ export default {
 			return
 		}
 		let permissions = tool.data.get("PERMISSIONS");
-		// if(permissions.auth.some((v)=> v === binding.value)){
-		// 	console.log(binding.value,800)
-		// }
 		if (!permissions.auth.some((v) => v === binding.value)) el.parentNode.removeChild(el);
 	}
 }
diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue
index 5743c3a..365b0a5 100644
--- a/src/views/setting/advanced/index.vue
+++ b/src/views/setting/advanced/index.vue
@@ -21,7 +21,7 @@
 		<el-main class="userMain userMainPadding_0">
 			<Suspense>
 				<template #default>
-					<component :is="page"/>
+					<component :is="page" />
 				</template>
 				<template #fallback>
 					<el-skeleton :rows="3" />
diff --git a/src/views/setting/company/add-permission.vue b/src/views/setting/company/add-permission.vue
index 0e53c0e..87e9bc8 100644
--- a/src/views/setting/company/add-permission.vue
+++ b/src/views/setting/company/add-permission.vue
@@ -85,7 +85,7 @@ export default {
 			res.data.forEach(item=>{
 				if(item.children){
 					item.children.forEach(em=>{
-						if(em.meta.data_permission){
+						if(em.meta.data_permission && em.meta.data_permission.length>0){
 							let check = em.meta.data_permission.filter((li)=>li.checked).length;
 							let ed = em.meta.data_permission.length;
 							em.isCheck = check>0 && check != ed?true:false;
@@ -109,7 +109,7 @@ export default {
 				if(item.children){
 					item.children.forEach(em=>{
 						em.checked = e;
-						if(em.meta.data_permission){
+						if(em.meta.data_permission && em.meta.data_permission.length>0){
 							em.meta.data_permission.forEach((li)=>{
 								li.checked = e;
 							})
@@ -130,7 +130,7 @@ export default {
 					if(item.children){
 						item.children.forEach(em=>{
 							em.checked = e.checked;
-							if(em.meta.data_permission){
+							if(em.meta.data_permission && em.meta.data_permission.length>0){
 								em.meta.data_permission.forEach((li)=>{
 									li.checked = e.checked;
 								})
@@ -152,7 +152,7 @@ export default {
 					if(item.children){
 						item.children.forEach(em=>{
 							if(em.id == e.id){
-								if(em.meta.data_permission){
+								if(em.meta.data_permission && em.meta.data_permission.length>0){
 									em.meta.data_permission.forEach((li)=>{
 										li.checked = e.checked;
 									})
@@ -197,7 +197,7 @@ export default {
 			const res = await this.$API.system.company.moduleAdd.post(params);
 			if(res.code == 200){
 				this.$message.success("授权成功");
-				this.getPermission();
+				await this.getPermission();
 			}
 		},
 		setList(){
@@ -215,7 +215,7 @@ export default {
 						if(em.checked || em.isCheck){
 							obj.menu_permission.push(em.meta.code);
 						}
-						if(em.meta.data_permission){
+						if(em.meta.data_permission && em.meta.data_permission.length>0){
 							let list = em.meta.data_permission.filter(e=>e.checked).map(u=>{
 								let obj = {
 									actions:u.actions,
diff --git a/src/views/setting/role/dataTree.vue b/src/views/setting/role/dataTree.vue
index b524346..cea835b 100644
--- a/src/views/setting/role/dataTree.vue
+++ b/src/views/setting/role/dataTree.vue
@@ -89,7 +89,7 @@ export default {
 					if(item.children){
 						item.children.forEach(em=>{
 							em.checked = e.checked;
-							if(em.meta.data_permission){
+							if(em.meta.data_permission && em.meta.data_permission.length>0){
 								em.meta.data_permission.forEach((li)=>{
 									li.checked = e.checked;
 								})
@@ -111,7 +111,7 @@ export default {
 					if(item.children){
 						item.children.forEach(em=>{
 							if(em.id == e.id){
-								if(em.meta.data_permission){
+								if(em.meta.data_permission && em.meta.data_permission.length>0){
 									em.meta.data_permission.forEach((li)=>{
 										li.checked = e.checked;
 									})
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index 69bacbf..4dbf47d 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -311,7 +311,7 @@
 							if(em.checked || em.isCheck){
 								obj.menu_permission.push(em.meta.code);
 							}
-							if(em.meta.data_permission){
+							if(em.meta.data_permission && em.meta.data_permission.length>0){
 								let list = em.meta.data_permission.filter(e=>e.checked).map(u=>{
 									let obj = {
 										actions:u.actions,
diff --git a/src/views/setting/role/permission.vue b/src/views/setting/role/permission.vue
index 671881f..ab31bb8 100644
--- a/src/views/setting/role/permission.vue
+++ b/src/views/setting/role/permission.vue
@@ -143,7 +143,7 @@ export default {
 						if(em.checked || em.isCheck){
 							obj.menu_permission.push(em.meta.code);
 						}
-						if(em.meta.data_permission){
+						if(em.meta.data_permission && em.meta.data_permission.length>0){
 							let list = em.meta.data_permission.filter(e=>e.checked).map(u=>{
 								let obj = {
 									actions:u.actions,