From f4634091d71bc3e99df179d5976b9c59a24ca5f7 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 12:00:46 +0800
Subject: [PATCH] 报告
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 34 ++++++++++++++++------------------
1 files changed, 16 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 caee526..7399842 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
@@ -446,21 +446,20 @@
SysPost byId = postService.getById(one.getPostId());
if (byId.getPostName().equals("褰曞叆鍛�")) {
ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-
}
}
}
} else {
ksproList = projectService.getKsTjProjectIdList();
}
-
+ if (ksproList == null || ksproList.size() == 0) {
+ return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+ }
//绛涢�夊寲楠岀殑椤圭洰銆�
ksproList = ksproList.stream()
.filter(element -> element ==1633660948860522629L)
.collect(Collectors.toList());
- if (ksproList == null || ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
+
List<TjCustomer> customerLis = new ArrayList<>();
//鏍规嵁浣撴鍙锋煡
@@ -655,6 +654,9 @@
ksproList = projectService.getKsTjProjectIdList();
}
//绛涢�夊奖鍍忕殑椤圭洰銆�
+ if (ksproList.size() == 0) {
+ return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+ }
ksproList = ksproList.stream()
.filter(element -> element ==1633660948860522589L
// || element ==1633660948860522504L
@@ -670,10 +672,6 @@
// element ==1633660948860522531L|| element ==1633660948860522533L
)
.collect(Collectors.toList());
-
- if (ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
List<TjCustomer> customerLis = new ArrayList<>();
//鏍规嵁浣撴鍙锋煡
@@ -820,18 +818,18 @@
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
}
// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
- if (customerLists.size() > 0) {
- Collections.reverse(customerLists);
- List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Map<String, Object> map = new HashMap<>();
- map.put("date", customerList);
- map.put("total", customerLists.size());
- return AjaxResult.success(map);
- } else {
+// if (customerLists.size() > 0) {
+// Collections.reverse(customerLists);
+// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// Map<String, Object> map = new HashMap<>();
+// map.put("date", customerList);
+// map.put("total", customerLists.size());
+// return AjaxResult.success(map);
+// } else {
AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
if (map != null) return map;
return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
- }
+// }
}
--
Gitblit v1.8.0