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

bug整改

Browse Source
This commit is contained in:
=
2026-01-13 08:38:04 +08:00
parent f906a79d7f
commit ef2a834216
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class ProposalExpeditingController {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
} }
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java
+1 -1
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_TC_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
cnd.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds()); cnd.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
} }
cnd.asc("id"); cnd.asc("id");
src/main/resources/views/platform/sys/user/index.html
+5 -1
View File
@@ -293,7 +293,11 @@ layout("/layouts/platform.html"){
const url = base + "/platform/sys/unit/tree" const url = base + "/platform/sys/unit/tree"
self.$axios.post(url, { pid: node.value }).then((res) => { self.$axios.post(url, { pid: node.value }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
resolve(res.data) let filteredData = res.data;
if (node.level === 0 && res.data && res.data.length > 0) {
filteredData = res.data.slice(1); // 移除第一个元素
}
resolve(filteredData);
} }
}) })
} }
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+1
View File
@@ -140,6 +140,7 @@ layout("/layouts/platform.html"){
<el-button <el-button
v-else-if="row.taskKey === 'startTask' v-else-if="row.taskKey === 'startTask'
|| row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
|| row.taskKey=== null
|| row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId" || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId"
@click="onDelete(row.id)" @click="onDelete(row.id)"
size="mini" type="danger">删除 size="mini" type="danger">删除