diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java index 8d14aa43..5a624946 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java @@ -141,8 +141,7 @@ public class ExecutiveCommitteeDelegationOnePushController { List userValue = dao.query(ExecutiveCommitteeOnePush.class, Cnd.where("teacherMeetId", "=", teacherMeetId) .and("addType", "=", 1)); - List onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW()); - List userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList()); + List userIds = userValue.stream().map(v -> v.getUserId()).collect(Collectors.toList()); Cnd cnd = Cnd.NEW(); cnd.andEX("db.sessionId", "=", teacherMeetId); diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html index 3ae3f0a4..e5ee763d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html @@ -195,6 +195,7 @@ layout("/layouts/platform.html"){ {label: "提案编号", prop: "code"}, {label: "提案名称", prop: "name"}, {label: "提案人", prop: "createUserName"}, + {label: "提案人单位", prop: "unitName", visible: false}, {label: "提案类别", prop: "typeName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"},