From 41f333836dc0fb5da5d586838375fca2c734417d Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 26 Jul 2021 10:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=AD=E5=8E=86-=E4=B8=80=E6=97=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=95=99=E5=B8=88=E7=99=BB=E5=BD=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../benyi/controller/ByCalendarController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java index a5872ee55..ce3e34dc9 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java @@ -176,8 +176,6 @@ public class ByCalendarController extends BaseController { //根据不同的幼儿园加载幼儿园园历 //(long)207 listvi.addAll(getbySchoolcalendars(schoolId, formatter, hashMap)); - //根据不同的幼儿园加载教职工 - listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap)); } // listvi.addAll(getbySchoolcalendars((long)207,formatter,hashMap)); // listvi.addAll(getbyteacherBiths((long)207,formatter,hashMap)); @@ -191,14 +189,17 @@ public class ByCalendarController extends BaseController { listvi.addAll(getbyclassthemes(classId, formatter, hashMap)); //根据班级加载幼儿生日 listvi.addAll(getbychilds(classId, formatter)); + }else{ + Long schoolId = SecurityUtils.getLoginUser().getUser().getDeptId(); + //幼儿一日流程评估计划 + listvi.addAll(getdayflowdata(classId, formatter)); + //根据不同的幼儿园加载教职工 + listvi.addAll(getbyteacherBiths(schoolId, formatter, hashMap)); } //幼儿出勤人数 listvi.addAll(getbychildcheckdata(classId, formatter)); - //幼儿一日流程评估计划 - listvi.addAll(getdayflowdata(classId, formatter)); - //幼儿园一日流程评估结果 Long userId = SecurityUtils.getLoginUser().getUser().getUserId(); listvi.addAll(getdayflowresult(userId, formatter));