From 971162978842f8cf87d34f99da8c529e2e945da8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 四月 2025 08:46:57 +0800
Subject: [PATCH] zjh20250415
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 4271cb5..4a56102 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -61,7 +62,14 @@
startPage();
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
if (tjRules.getProId() != null) {
- wq.eq(TjRules::getProId, tjRules.getProId());
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
+ if(null !=projects && !projects.isEmpty()){
+ wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
+ .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
+ }else {
+ wq.eq(TjRules::getProId, tjRules.getProId());
+ }
+
}
if (tjRules.getProName() != null) {
wq.like(TjRules::getProName, tjRules.getProName());
@@ -83,14 +91,7 @@
}
wq.orderByAsc(TjRules::getSort);
List<TjRules> list = tjRulesService.list(wq);
- if (list != null) {
- for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz, rules.getAid());
- final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
- rules.setRuleAdvices(list1);
- }
- }
+
return getDataTable(list);
}
--
Gitblit v1.8.0