1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Merge remote-tracking branch 'origin/issue-853' into develop

This commit is contained in:
Hai Liang Wang 2023-06-30 12:31:11 +08:00
commit 5b185aa197

View File

@ -88,7 +88,7 @@ public class ProcessedSummaryController extends Handler {
List<Predicate> list = new ArrayList<>(); List<Predicate> list = new ArrayList<>();
Expression<String> exp = root.<String>get("skill"); Expression<String> exp = root.<String>get("skill");
list.add(exp.in(organs.keySet())); list.add(exp.in(organs.keySet()));
list.add(cb.equal(root.get("process").as(boolean.class), 1)); list.add(cb.equal(root.get("process").as(boolean.class), true));
list.add(cb.notEqual(root.get("channel").as(String.class), MainContext.ChannelType.PHONE.toString())); list.add(cb.notEqual(root.get("channel").as(String.class), MainContext.ChannelType.PHONE.toString()));
if (!StringUtils.isBlank(ani)) { if (!StringUtils.isBlank(ani)) {
list.add(cb.equal(root.get("ani").as(String.class), ani)); list.add(cb.equal(root.get("ani").as(String.class), ani));