From 08e428f5c3b8622ed0de73c29e71dc08a312d47d Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Thu, 29 May 2025 08:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=A7=BB=E5=8A=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?appIdbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/dataset/form/CreatDsGroup.vue      | 7 +++----
 .../viewsnew/application/service/dataset/form/index.vue    | 2 +-
 .../application/service/datasource/form/CreatDsGroup.vue   | 6 +++---
 sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java    | 2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
index 4e088c2..77b6a33 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
@@ -42,7 +42,7 @@ const state = reactive({
 const placeholder = ref('')
 const nodeType = ref()
 const pid = ref()
-const appId = ref()
+const appId:any = ref("")
 const id = ref()
 const cmd = ref('')
 const treeRef = ref()
@@ -154,7 +154,7 @@ const createInit = (type, data: Tree, exec, name: string) => {
   datasetForm.name = ''
   filterText.value = ''
   nodeType.value = type
-  if(type === 'folder' && data !=null && data.appId !=null){
+  if(data !=null && data.appId !=null){
     appId.value = data.appId
   }
   placeholder.value =
@@ -164,7 +164,7 @@ const createInit = (type, data: Tree, exec, name: string) => {
     allfields = data.allfields
   }
   if (data.id) {
-    const request = { leaf: false, weight: 7 } as BusiTreeRequest
+    const request = { leaf: false, weight: 7,appId: data.appId } as BusiTreeRequest
     getDatasetTree(request).then(res => {
       filterFreeFolder(res, 'dataset')
       dfs(res as unknown as Tree[])
@@ -254,7 +254,6 @@ const saveDataset = () => {
         name: datasetForm.name,
         appId: appId.value
       }
-
       switch (cmd.value) {
         case 'move':
           params.pid = activeAll.value ? '0' : (datasetForm.pid as string)
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
index 466f222..d63035a 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
@@ -1409,7 +1409,7 @@ const datasetSave = () => {
 
   creatDsFolder.value.createInit(
     'dataset',
-    { id: pid || '0', union, allfields: allfields.value },
+    { id: pid || '0', union,appId:appId.value, allfields: allfields.value },
     '',
     datasetName.value
   )
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/CreatDsGroup.vue
index a088d4e..51cb22a 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/CreatDsGroup.vue
@@ -46,7 +46,7 @@ const cmd = ref('')
 const treeRef = ref()
 const filterText = ref('')
 const datasetForm = reactive({
-  pid: '',
+  pid: '0',
   name: ''
 })
 const searchEmpty = ref(false)
@@ -371,7 +371,7 @@ const emits = defineEmits(['finish', 'handleShowFinishPage'])
       <el-form-item v-if="showName" :label="labelName" prop="name">
         <el-input :placeholder="placeholder" v-model="datasetForm.name" />
       </el-form-item>
-      <el-form-item v-if="showPid" :label="t('deDataset.folder')" prop="pid">
+      <!-- <el-form-item v-if="showPid" :label="t('deDataset.folder')" prop="pid">
         <el-tree-select
           v-model="datasetForm.pid"
           :data="state.tData"
@@ -427,7 +427,7 @@ const emits = defineEmits(['finish', 'handleShowFinishPage'])
             <span>{{ t('data_source.relevant_content_found') }}</span>
           </div>
         </div>
-      </div>
+      </div> -->
     </el-form>
     <template #footer>
       <el-button secondary @click="resetForm">{{ t('dataset.cancel') }} </el-button>
diff --git a/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java b/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java
index bbfcbfe..90e4f75 100644
--- a/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java
+++ b/sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java
@@ -20,6 +20,8 @@ public class BusiNodeVO implements TreeResultModel<BusiNodeVO>, Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     @Schema(description = "ID")
     private Long id;
+    @Schema(description = "项目id")
+    private String appId;
     @Schema(description = "名称")
     private String name;
     @Schema(description = "是否叶子")