commit
This commit is contained in:
+1
-2
@@ -10,7 +10,6 @@ import com.budwk.app.base.annotation.SLog;
|
|||||||
import com.budwk.app.base.param.PageForm;
|
import com.budwk.app.base.param.PageForm;
|
||||||
import com.budwk.app.base.result.Result;
|
import com.budwk.app.base.result.Result;
|
||||||
import com.budwk.app.base.service.BaseService;
|
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.ExecutiveCommitteeConfig;
|
||||||
import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush;
|
import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
@@ -114,7 +113,7 @@ public class ExecutiveCommitteePushController {
|
|||||||
Cnd cnd = Cnd.NEW();
|
Cnd cnd = Cnd.NEW();
|
||||||
cnd.andEX("db.sessionId", "=", teacherMeetId);
|
cnd.andEX("db.sessionId", "=", teacherMeetId);
|
||||||
cnd.andEX("db.userId", "not in", userIds);
|
cnd.andEX("db.userId", "not in", userIds);
|
||||||
cnd.andEX("db.userId", "!=", SecurityUtil.getUserId());
|
// cnd.andEX("db.userId", "!=", SecurityUtil.getUserId());
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
db.*,
|
db.*,
|
||||||
|
|||||||
+1
-1
@@ -172,7 +172,7 @@ public class ExecutiveCommitteeUnionPushController {
|
|||||||
cnd.andEX("db.sessionId", "=", teacherMeetId);
|
cnd.andEX("db.sessionId", "=", teacherMeetId);
|
||||||
cnd.andEX("db.userId", "not in", userIds);
|
cnd.andEX("db.userId", "not in", userIds);
|
||||||
cnd.andEX("db.userId", "not in", unionPushUserIds);
|
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());
|
cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
|
|||||||
Reference in New Issue
Block a user