FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公开征求意见--查询修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-06 17:37:47 +08:00
parent f15935bbef
commit 1012aec3d3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+12 -2
View File
@@ -53,11 +53,21 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
.ge(start != null, "start_time", start) .ge(start != null, "start_time", start)
.le(end != null, "end_time", end) .le(end != null, "end_time", end)
.orderByDesc("start_time"); .orderByDesc("start_time");
}else if (start!=null){
list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(start != null, "start_time", start)
.ge(start != null, "end_time", start)
.orderByDesc("start_time");
}else if (end!=null){
list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(end != null, "start_time", end)
.ge(end != null, "end_time", end)
.orderByDesc("start_time");
}else { }else {
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname) .like(StringUtils.isNotEmpty(cname), "cid", cname)
.ge(start != null, "start_time", start)
.le(end != null, "end_time", end)
.orderByDesc("start_time"); .orderByDesc("start_time");
} }
} else { } else {