diff --git a/src/main/java/io/v/nutz/welfare/controller/escalation/WelfareMemberEscalationController.java b/src/main/java/io/v/nutz/welfare/controller/escalation/WelfareMemberEscalationController.java index 9596dcc..5338bdc 100644 --- a/src/main/java/io/v/nutz/welfare/controller/escalation/WelfareMemberEscalationController.java +++ b/src/main/java/io/v/nutz/welfare/controller/escalation/WelfareMemberEscalationController.java @@ -92,10 +92,12 @@ public class WelfareMemberEscalationController { Cnd cnd = Cnd.NEW(); cnd.and("unionId", "=", Vi.getUnionId()); - SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.and("member","=",1); - seg.or(Cnd.exps("userState","=","退休").and(Cnd.exps("retiredTime",">=","2024-06-01").and("retiredTime","<","2024-12-30"))); - cnd.and(seg); +// SqlExpressionGroup seg = new SqlExpressionGroup(); +// seg.and("member","=",1); +// seg.or(Cnd.exps("userState","=","退休").and(Cnd.exps("retiredTime",">=","2024-06-01").and("retiredTime","<","2024-12-30"))); +// cnd.and(seg); + + cnd.and("member", "=", 1); cnd.asc("userState").asc("unitname").asc("unionname"); // cnd.and("userState", "=", "在职");