From 344229fc311851120695902cb8fa7fd00bfd3bd6 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 18 Dec 2025 11:51:10 +0800 Subject: [PATCH] commit --- .../controller/ActivityWorksCollectionReadController.java | 4 ++-- src/main/resources/views/layouts/v4/baseLayout.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java index ad3b69a..44b6952 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java @@ -145,8 +145,8 @@ public class ActivityWorksCollectionReadController { cnd.andEX("up.activityId", "=", pageForm.getActivityId()); cnd.andEX("up.subjectId", "=", pageForm.getSubjectId()); cnd.andEX("up.worksId", "=", pageForm.getWorksId()); - cnd.andEX("unionId", "=", pageForm.getUnionId()); - cnd.andEX("unitId", "=", pageForm.getUnitId()); + cnd.andEX("up.unionId", "=", pageForm.getUnionId()); + cnd.andEX("up.unitId", "=", pageForm.getUnitId()); if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.orLike("userName", pageForm.getSearchKeyword()); diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index c3435d5..c2f4a00 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -168,7 +168,7 @@ this.isSubscribed = true this.sendJoinMessage() } - }, 2000) + }, 500) } // 事件处理 @@ -243,9 +243,9 @@ if (this.ws.readyState === WebSocket.OPEN) { this.sendJoinMessage() } - }, 1000) + }, 500) } - }, 3000) // 延迟3秒重连 + }, 2000) // 延迟2秒重连 } // 窗口事件处理