From a6e6348c8008fd3984fc0f42323c17b322be142f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 23 一月 2024 14:50:16 +0800
Subject: [PATCH] zjh 2024/01/23--2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 8c51008..0d03dae 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -413,10 +413,10 @@
}
/**
- * 褰卞儚妫�鏌ラ〉闈㈠垪琛�
+ * 鍖栭獙妫�鏌ラ〉闈㈠垪琛�
*/
@GetMapping("/huaYangetProList")
- @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
+ @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult huaYangetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
@ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@@ -454,9 +454,9 @@
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊奖鍍忕殑椤圭洰銆�
+ //绛涢�夊寲楠岀殑椤圭洰銆�
ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522589L)
+ .filter(element -> element ==1633660948860522629L)
.collect(Collectors.toList());
if (ksproList == null || ksproList.size() == 0) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
@@ -623,10 +623,10 @@
/**
- * 鍖栭獙妫�鏌ラ〉闈㈠垪琛�
+ * 褰卞儚妫�鏌ラ〉闈㈠垪琛�
*/
@GetMapping("/yingXiangGetProList")
- @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
+ @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult yingXiangGetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
@ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@@ -663,19 +663,20 @@
} else {
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊寲楠岀殑椤圭洰銆�
+ //绛涢�夊奖鍍忕殑椤圭洰銆�
ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522629L || element ==1633660948860522504L
- ||
- element ==1633660948860522507L|| element ==1633660948860522508L
- ||
- element ==1633660948860522515L|| element ==1633660948860522516L
- ||
- element ==1633660948860522517L|| element ==1633660948860522519L
- ||
- element ==1633660948860522524L|| element ==1633660948860522530L
- ||
- element ==1633660948860522531L|| element ==1633660948860522533L
+ .filter(element -> element ==1633660948860522589L
+// || element ==1633660948860522504L
+// ||
+// element ==1633660948860522507L|| element ==1633660948860522508L
+// ||
+// element ==1633660948860522515L|| element ==1633660948860522516L
+// ||
+// element ==1633660948860522517L|| element ==1633660948860522519L
+// ||
+// element ==1633660948860522524L|| element ==1633660948860522530L
+// ||
+// element ==1633660948860522531L|| element ==1633660948860522533L
)
.collect(Collectors.toList());
--
Gitblit v1.8.0