From dc69b0d51b4dd13d4db0cfda439395b781de5bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Sun, 19 Oct 2025 20:49:37 +0800 Subject: [PATCH] .. --- .../TeacherCongressDelegateTransitionController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateTransitionController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateTransitionController.java index 6f0e7185..380a6d15 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateTransitionController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateTransitionController.java @@ -61,10 +61,12 @@ public class TeacherCongressDelegateTransitionController { List delegates = dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId)); dao.fetchLinks(delegates, "delegation"); // 上一届次代表 - List lastDelegates = new ArrayList<>(); + List lastDelegates; if (lastSession != null) { - dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId())); + lastDelegates = dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId())); dao.fetchLinks(lastDelegates, "delegation"); + } else { + lastDelegates = new ArrayList<>(); } // 代表数据 @@ -186,10 +188,12 @@ public class TeacherCongressDelegateTransitionController { dao.fetchLinks(delegates, "delegation"); // 上一届次代表 - List lastDelegates = new ArrayList<>(); + List lastDelegates; if (lastSession != null) { - dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId())); + lastDelegates = dao.query(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", lastSession.getId())); dao.fetchLinks(lastDelegates, "delegation"); + } else { + lastDelegates = new ArrayList<>(); } // 代表数据