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<>(); } // 代表数据