From 8d584b66f74d578ce61be70f4da73cbc6cabeb45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Tue, 27 Oct 2026 15:42:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=A5=E6=BA=90=EF=BC=9A=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=20#69?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

     孙飙已退休，我后台也已设置为非会员，系统里已看不到他了。可是这次“福享生活”后台勾选时，运动健康学院系统操作员魏震在勾选人员名单时，全选了，然后把孙飙也选上了。我这看不到，他那怎么会看到的呢？请修复Bug.
---
 .../escalation/WelfareMemberEscalationController.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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", "=", "在职");