From 7077fa8ff7f18b2991deafaba9f9dc65d1d27f51 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 27 十二月 2023 16:12:12 +0800
Subject: [PATCH] zjh 本地 2023/12/27 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 b94ca7d..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());
@@ -125,7 +132,7 @@
/**
* 瀵煎嚭浣撴椤圭洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:export')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:export')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭浣撴椤圭洰鍒楄〃")
@@ -138,7 +145,7 @@
/**
* 鑾峰彇浣撴椤圭洰璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:query')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:query')")
@GetMapping(value = "/{proId}")
@ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("proId") @ApiParam(value = "浣撴椤圭洰id") Long proId) {
@@ -174,7 +181,7 @@
/**
* 鏂板浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:add')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:add')")
@ApiOperation(value = "鏂板浣撴椤圭洰")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.INSERT)
@PostMapping
@@ -245,7 +252,7 @@
/**
* 淇敼浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:edit')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:edit')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴椤圭洰")
@@ -344,7 +351,7 @@
/**
* 鍒犻櫎浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
+ // @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{proIds}")
@ApiOperation(value = "鍒犻櫎浣撴椤圭洰(鍙垹闄ょ埗椤圭洰鍜屽瓙椤圭洰)")
--
Gitblit v1.8.0