From 19d096df96fa5587ee0e94dfe944025113511410 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Tue, 24 Nov 2020 15:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=AD=E5=8E=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/benyi/controller/ByCalendarController.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 5f13868f1..e098f839c 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
@@ -164,7 +164,7 @@ 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));
@@ -218,8 +218,13 @@ public class ByCalendarController extends BaseController {
     private List<ByCalendarShow> getbyteacherBiths(Long schoolId, SimpleDateFormat formatter, HashMap<String, String> hashMap) {
         SysUser sysUser = new SysUser();
         sysUser.setDeptId(schoolId);
+
         ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();
         byTeacherJbxx.setUser(sysUser);
+        String classId = schoolCommon.getClassId();
+        if (!schoolCommon.isStringEmpty(classId)) {
+            byTeacherJbxx.setUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+        }
         List<ByTeacherJbxx> listTeacherBirth = byTeacherJbxxService.selectByTeacherJbxxList(byTeacherJbxx);
 
         List<ByCalendarShow> listvi = new ArrayList<>();