commit

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);