From b0f292b0b4ba853c41f457fe12d7b6f1ce5141b7 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 18:11:49 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 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 aeb73ef..a1ca1bb 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
@@ -83,10 +83,10 @@
     @GetMapping("/getDxList")
     @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
     public AjaxResult getDxList() {
-        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
-        wq0.eq(TjProject::getProParentId, 0);
+//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+//        wq0.eq(TjProject::getProParentId, 0);
 
-        List<TjProject> tjProjects = tjProjectService.list(wq0);
+        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
 
         //涓婇潰鐨勬崲sql
 //        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
@@ -181,21 +181,27 @@
     }
 
 
+    @GetMapping("/getPacTjProjectList")
+    @ApiOperation(value = "缁存姢濂楅椤甸潰鏂板椤圭洰鏃惰皟鐢�")
+    public AjaxResult getPacTjProjectList() {
+        List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
+        return AjaxResult.success(tjProjects);
+    }
+
+
     /**
      * 鏌ヨ浣撴椤圭洰鍒楄〃
      */
     @GetMapping("/list")
     @ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
     public AjaxResult list() {
-        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
-        wq.eq(TjProject::getProParentId, 0);
-        wq.eq(TjProject::getProStatus, 0);
-        List<TjProject> tjProjects = tjProjectService.list(wq);
+//        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+//        wq.eq(TjProject::getProParentId, 0);
+//        wq.eq(TjProject::getProStatus, 0);
+        List<TjProject> tjProjects = tjProjectService.getTjProjectList();
         if (tjProjects != null) {
             for (TjProject project : tjProjects) {
-                LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
-                wq1.eq(TjProject::getProParentId, project.getProId());
-                List<TjProject> projectList = tjProjectService.list(wq1);
+                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                 project.setTjProjectList(projectList);
             }
             return AjaxResult.success(tjProjects);

--
Gitblit v1.8.0