diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
index 3455bc47..1539e094 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
@@ -368,10 +368,13 @@ public class TeacherCongressDelegatePushController {
@ApiOperation("本单位代表上报情况")
@SaCheckPermission("tc.delegate.push")
public Result selfUnionPushMetric(String sessionId, String unionId) {
+ if (StrUtil.isBlank(unionId)){
+ unionId = SecurityUtil.getUnionId();
+ }
Teacher_congress_quota_allocation allocation = dao.fetch(Teacher_congress_quota_allocation.class,
Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId)
- .and(Teacher_congress_quota_allocation::getUnionId, "=", SecurityUtil.getUnionId()));
+ .and(Teacher_congress_quota_allocation::getUnionId, "=", unionId));
if (allocation == null) {
return Result.success();
}
@@ -404,7 +407,7 @@ public class TeacherCongressDelegatePushController {
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("info.sessionId", "=", sessionId);
- cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId());
+ cnd.andEX("info.unionId", "=", unionId);
cnd.andEX("info.representativeType", "=", "正式代表");
cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
sql.setCondition(cnd);
diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
index 0c6d0b2f..41f9ff49 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
-
+
@@ -238,7 +238,7 @@ layout("/layouts/platform.html"){
this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
- this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName)
+ this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName,this.pageForm.unionId)
},
onView(row) {
this.writeDialog = true