From 2e64e265a7d130d9d1086f1d6d90a627fa85e6de Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 13 Nov 2024 15:41:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E6=80=81=E7=A7=91=E6=8A=80?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=2011.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectApplication/kejigongguan/data.ts      | 7 +++++--
 .../kejigongguan/projectApplicationList.vue                | 1 +
 .../src/views/projectApplication/project/ProjectList.vue   | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index 7e8325b..5dd5ac3 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -18,10 +18,13 @@ export const projectBaseInfoSchemas: FormSchema[] = [
   },
   {
     field: 'annualId',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'project_type,annual_name,id',
+    },
     label: '计划年度',
     dynamicDisabled: true,
-    defaultValue: '2025',
+    // defaultValue: '2025',
   },
   {
     field: 'batchNo',
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index 4cda7e7..1e906ab 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -44,6 +44,7 @@
       const setformValue1 = async () => {
         // console.log(route,'route')
         await setFieldsValue({projectTypeid: route.query.projectTypeId})
+        await setFieldsValue({annualId: route.query.projectTypeId})
       };
       nextTick(() => {
         setformValue1();
diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
index 7a7af65..382b31d 100644
--- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
@@ -175,9 +175,9 @@ async function getProjectType(){
   await getProjectTypeList(params).then(res=>{
   console.log("getProjectType is invoke-----------",JSON.stringify(res.records))
     projectTypeList.value = res.records.map(item => {
-      return {label:item.typeName,key:item.id}
+      return {label:item.typeName, key:item.id, annualId:item.annualName}
     })
-    console.log(JSON.stringify(projectTypeList));
+    console.log("the projectTypeList :",JSON.stringify(projectTypeList));
   })
 }
 

From 05657b2b6abba4c1f61d1599bf27984897e500a5 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 13 Nov 2024 17:29:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=B2=A1=E6=9C=89=E5=8E=BB=E6=8E=89=E5=B7=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/system/controller/SysDepartController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index e97c8a3..c033d85 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -204,7 +204,7 @@ public class SysDepartController {
     @GetMapping(value = "/getDepartList4Quxian")
     public Result<List<QuXianDepartVo>> getDepartList4Quxian() {
         SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, ""));
-        List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()));
+        List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()).eq(SysDepart::getDelFlag, "0"));
         List<QuXianDepartVo> quXianDepartVos = new ArrayList<>();
         Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> {
             QuXianDepartVo vo = new QuXianDepartVo();