c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-12-23 15:28:24 +08:00
parent c6e1c2209c
commit 1d36003f9c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java
+5 -5
View File
@@ -56,7 +56,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
@Override @Override
public Pagination<Teacher_congress_delegate> pageData(TeacherCongressDelegateManagePageParam pageForm) { public Pagination<Teacher_congress_delegate> pageData(TeacherCongressDelegateManagePageParam pageForm) {
Cnd cnd = buildCondition(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.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
} }
cnd.asc("id"); cnd.asc("id");
@@ -88,7 +88,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
$condition $condition
"""); """);
Cnd cnd = buildCondition(pageForm, "t1."); 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()); 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("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
delegateGroupList.get(i).get(j).put("sex" + j, delegateGroupList.get(i).get(j).getString("sex")); 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")); buildMap.put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
if(StrUtil.isNotBlank(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") + ")"); buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
} }
} }
buildMaps.add(buildMap); buildMaps.add(buildMap);
} }