From ea05537cc2a134d376b5412c332190e0a3fd0c23 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 30 Jul 2025 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin-pc/src/components/jeecg/JTreeSelect.vue | 28 ++++++++++++++++++++--
admin-pc/src/components/tools/UserMenu.vue | 14 +++++------
admin-pc/src/views/system/UserList.vue | 8 +++----
admin-pc/src/views/system/modules/UserModal.vue | 23 +++++++++---------
.../jeecg/api/controller/ApiOrderController.java | 5 ++--
.../org/jeecg/api/service/ApiIndexService.java | 2 +-
.../api/service/impl/ApiIndexServiceImpl.java | 8 ++++---
.../entity/PopularizeEvaluate.java | 14 ++++++++---
.../controller/PopularizeOrderController.java | 3 +++
9 files changed, 72 insertions(+), 33 deletions(-)
diff --git a/admin-pc/src/components/jeecg/JTreeSelect.vue b/admin-pc/src/components/jeecg/JTreeSelect.vue
index c681c38..83e815c 100644
--- a/admin-pc/src/components/jeecg/JTreeSelect.vue
+++ b/admin-pc/src/components/jeecg/JTreeSelect.vue
@@ -214,13 +214,37 @@
this.$emit('change', '');
this.treeValue = null
} else if (value instanceof Array) {
- this.$emit('change', value.map(item => item.value).join(','))
+ // 处理多选情况,递归获取所有子节点
+ let allSelectedValues = [];
+ value.forEach(item => {
+ allSelectedValues.push(item.value);
+ // 递归获取所有子节点
+ let childrenValues = this.getAllChildrenValues(item.value, this.treeData);
+ allSelectedValues = allSelectedValues.concat(childrenValues);
+ });
+ // 去重
+ allSelectedValues = [...new Set(allSelectedValues)];
+ this.$emit('change', allSelectedValues.join(','));
this.treeValue = value
} else {
this.$emit('change', value.value,value.label)
this.treeValue = value
}
-
+ },
+ getAllChildrenValues(value, treeData) {
+ let childrenValues = [];
+ for (let item of treeData) {
+ if (item.key === value) {
+ if (item.children && item.children.length > 0) {
+ for (let child of item.children) {
+ childrenValues.push(child.value);
+ childrenValues = childrenValues.concat(this.getAllChildrenValues(child.value, item.children));
+ }
+ }
+ break;
+ }
+ }
+ return childrenValues;
},
onSearch(value){
console.log(value)
diff --git a/admin-pc/src/components/tools/UserMenu.vue b/admin-pc/src/components/tools/UserMenu.vue
index 6efba61..2befd95 100644
--- a/admin-pc/src/components/tools/UserMenu.vue
+++ b/admin-pc/src/components/tools/UserMenu.vue
@@ -31,25 +31,25 @@
-
+