zjh20250410

zjh

2025-04-10 6d09c6301492d3095ff64dba2336f0d0b69638e6

 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);
    }