From 6b354729688853e3cf4b083530bc466ed0836fb1 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 19 二月 2024 17:36:36 +0800 Subject: [PATCH] zjh 2024/02/19--1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 18 ++++++++---------- 1 files changed, 8 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..5ab8667 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); @@ -187,15 +187,13 @@ @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