|
|
@@ -61,7 +61,15 @@ public interface BoilerConnectRecordReportMapper extends BaseMapperX<BoilerConne
|
|
|
}
|
|
|
|
|
|
if (StrUtil.isNotEmpty(reqVO.getIsMainProject())) {
|
|
|
- recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, reqVO.getIsMainProject());
|
|
|
+ if (reqVO.getIsMainProject().equals("true")){
|
|
|
+ recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, "1");
|
|
|
+ }else if (reqVO.getIsMainProject().equals("false")){
|
|
|
+ // 有些数据为空,查询非主项目(包括 "0" 和 null)
|
|
|
+ recordDOMPJLambdaWrapper.and(w -> w.eq(BoilerConnectRecordReportDO::getIsMainProject, "0")
|
|
|
+ .or()
|
|
|
+ .isNull(BoilerConnectRecordReportDO::getIsMainProject));
|
|
|
+ }
|
|
|
+// recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, reqVO.getIsMainProject());
|
|
|
}
|
|
|
|
|
|
if (StrUtil.isNotEmpty(reqVO.getRecordTemplateCode())) {
|