This commit is contained in:
=
2026-03-12 17:49:30 +08:00
parent 0f861019b2
commit 4ba166a918
2 changed files with 10 additions and 3 deletions
@@ -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);
@@ -7,14 +7,14 @@ const BASIC_FORM = {
<el-col :span="12">
<el-form-item label="代表姓名" prop="createUserId">
<user-select
:disabled="school || !$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])"
:disabled="school || !$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN','TEACHER_CONGRESS_DELEGATION_CONTACT'])"
ref="userSelectRef"
v-model="formData.createUserId"
style="width: 100%"
api="/platform/teacherCongress/common/listDelegate"
option_label="userName"
option_value="userId"
:api_params="{sessionId:formData.sessionId}"
:api_params="{sessionId:formData.sessionId,delegationId:formData.delegationId}"
:option_label_func="(item)=>{return item.userName + ' - ' + item.loginName}"
@change="userChange"
></user-select>