This commit is contained in:
2025-12-23 15:28:24 +08:00
parent c6e1c2209c
commit 1d36003f9c
@@ -56,7 +56,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
@Override
public Pagination<Teacher_congress_delegate> pageData(TeacherCongressDelegateManagePageParam pageForm) {
Cnd cnd = buildCondition(pageForm, "");
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
cnd.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
}
cnd.asc("id");
@@ -88,7 +88,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
$condition
""");
Cnd cnd = buildCondition(pageForm, "t1.");
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
cnd.and("t1.delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
}
@@ -173,9 +173,9 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
delegateGroupList.get(i).get(j).put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
delegateGroupList.get(i).get(j).put("sex" + j, delegateGroupList.get(i).get(j).getString("sex"));
buildMap.put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
if(StrUtil.isNotBlank(delegateGroupList.get(i).get(j).getString("sex"))) {
buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
}
if (StrUtil.isNotBlank(delegateGroupList.get(i).get(j).getString("sex"))) {
buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
}
}
buildMaps.add(buildMap);
}