commit

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("up.unionId", "=", pageForm.getUnionId());
-        cnd.andEX("unitId", "=", pageForm.getUnitId());
+        cnd.andEX("up.unitId", "=", pageForm.getUnitId());
         if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup seg = new SqlExpressionGroup();
             seg.orLike("userName", pageForm.getSearchKeyword());

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秒重连
                 }
 
                 // 窗口事件处理