From 4ba166a918cde1b2220d5e079477bfa5fd7fe784 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Mar 2026 17:49:30 +0800 Subject: [PATCH] commit --- .../common/TeacherCongressCommonController.java | 9 ++++++++- .../zhgh/democratic/opinion/transact/write/form.js | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/common/TeacherCongressCommonController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/common/TeacherCongressCommonController.java index 7421d316..597538da 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/common/TeacherCongressCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/common/TeacherCongressCommonController.java @@ -1,10 +1,12 @@ package com.budwk.app.zhgh.democratic.teachercongress.common; import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.stp.StpUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_role; import com.budwk.app.sys.services.SysRoleService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation; import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session; @@ -14,6 +16,7 @@ import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -54,10 +57,14 @@ public class TeacherCongressCommonController { @At @SaCheckLogin - public Result listDelegate(String sessionId, String keyWord) { + public Result listDelegate(String sessionId, String delegationId,String keyWord) { Cnd cnd = Cnd.NEW(); cnd.and("sessionId", "=", sessionId); + if (AuthUtil.hasRole(RoleConstant.TEACHER_CONGRESS_DELEGATION_CONTACT.name())) { + cnd.and("delegationId", "=", delegationId); + } + SqlExpressionGroup group = new SqlExpressionGroup(); group.orLike("userName", keyWord); group.orLike("loginName", keyWord); diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js index 34ea591e..7476d7e2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js @@ -7,14 +7,14 @@ const BASIC_FORM = {