From 56fb79ce92bfcb4fd3526e12121dc517dd3b9ca9 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 01 二月 2024 14:46:38 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 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 2661014..6fc5f47 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
@@ -82,20 +82,6 @@
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);
-// }
-//
-// List<TjProject> tjProjects = tjProjectService.list(wq0);
-
//涓婇潰鐨勬崲sql
final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
@@ -294,6 +280,7 @@
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
if (null != list && list.size() > 0) {
for (TjProject project : list) {
+ project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
project.setProCheckMethod(tjProject.getProCheckMethod());
project.setProStatus(tjProject.getProStatus());
@@ -318,6 +305,9 @@
}
}
TjProject byId1 = tjProjectService.selectTjProjectByProId(tjProject.getProParentId());
+ if(null !=byId1 && !tjProject.getDeptId().equals(byId1.getDeptId())){
+ return AjaxResult.error("涓嶅彲鏇存敼鐖堕」鐩瀹�!");
+ }
if(null !=byId1){
tjProject.setIsSampling(byId1.getIsSampling());
}
--
Gitblit v1.8.0