From fc3ff8fbb16b7f6891af94a799a65179a83f65c0 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 30 Mar 2026 10:03:13 +0800 Subject: [PATCH] commit --- .../controller/ExecutiveCommitteePushController.java | 3 +-- .../controller/ExecutiveCommitteeUnionPushController.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java index cc6d88f7..aec6dc34 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java @@ -10,7 +10,6 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig; import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush; import io.swagger.annotations.Api; @@ -114,7 +113,7 @@ public class ExecutiveCommitteePushController { Cnd cnd = Cnd.NEW(); cnd.andEX("db.sessionId", "=", teacherMeetId); cnd.andEX("db.userId", "not in", userIds); - cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); +// cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); Sql sql = Sqls.create(""" SELECT db.*, diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java index da057b63..5385f127 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java @@ -172,7 +172,7 @@ public class ExecutiveCommitteeUnionPushController { cnd.andEX("db.sessionId", "=", teacherMeetId); cnd.andEX("db.userId", "not in", userIds); cnd.andEX("db.userId", "not in", unionPushUserIds); - cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); +// cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); Sql sql = Sqls.create(""" SELECT