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

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!357
This commit is contained in:
王夏晖
2022-01-06 17:40:06 +08:00
parent d678c4bcc8 1012aec3d3
commit 853821bd45
1 changed files with 11 additions and 1 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
+11 -1
View File
@@ -53,12 +53,22 @@ 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 { }else if (start!=null){
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)
.le(start != null, "start_time", start) .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) .ge(end != null, "end_time", end)
.orderByDesc("start_time"); .orderByDesc("start_time");
}else {
list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname)
.orderByDesc("start_time");
} }
} else { } else {
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)