From 2a9583fd376451ca77a0400af7f3a02d1b80e7f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 18:04:34 +0800
Subject: [PATCH] 2025-06-24

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index a8dc766..1abfb5a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -790,8 +790,20 @@
     @ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
     public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
         try {
-            List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
-            return AjaxResult.success(list);
+            LambdaQueryWrapper<TjBzPro> tjBzProLambdaQueryWrapper = new LambdaQueryWrapper<>(TjBzPro.class);
+            if(StringUtil.isNotBlank(bz)){
+                tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
+                List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
+                for (TjBzPro bzPro : list) {
+                    TjProject tjProject = tjProjectService.getById(bzPro.getProId());
+                    if(null != tjProject)bzPro.setProName(tjProject.getProName());
+                }
+                return AjaxResult.success(list);
+            }else {
+                List<TjProject> list = tjProjectService.selectTjProjectListByBz();
+                return AjaxResult.success(list);
+            }
+
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

--
Gitblit v1.8.0