From 4ccd96e52b9815ddfd5528fbebc6560042ec189b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 22 十二月 2023 10:49:13 +0800
Subject: [PATCH] zjh 本地 2023/12/22 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 a6687df..8f87e6b 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
@@ -66,27 +66,34 @@
public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName,
@RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, 0);
- if(null !=proName){
- wq0.like(TjProject::getProName,proName);
- }
- if(null !=checkType){
- wq0.like(TjProject::getProCheckType,checkType);
- }
- if(null !=deptId){
- wq0.like(TjProject::getDeptId,deptId);
- }
+// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjProject::getProParentId, 0);
+// if(null !=proName){
+// wq0.like(TjProject::getProName,proName);
+// }
+// if(null !=checkType){
+// wq0.like(TjProject::getProCheckType,checkType);
+// }
+// if(null !=deptId){
+// wq0.like(TjProject::getDeptId,deptId);
+// }
+//
+// List<TjProject> tjProjects = tjProjectService.list(wq0);
- List<TjProject> tjProjects = tjProjectService.list(wq0);
+ //涓婇潰鐨勬崲sql
+ final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+
if (tjProjects != null) {
for (TjProject project : tjProjects) {
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjProject::getProParentId, project.getProId());
+ if(null !=proName) {
+ wq1.like(TjProject::getProName, proName);
+ }
List<TjProject> projectList = tjProjectService.list(wq1);
project.setTjProjectList(projectList);
- //鏍规嵁姣忎釜椤圭洰鐨刣eptId鎷垮埌name 2023/2/7
+
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
if (sysDept!=null){
project.setDeptName(sysDept.getDeptName());
--
Gitblit v1.8.0