From a37ef37e35becfddb5630c4fa8385c9280ef158c Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Mon, 4 Mar 2024 14:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=80=BC=E7=8F=ADbug+=E4=BA=A4=E6=8E=A5=E7=8F=ADbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyRecServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 307d893..98fb1aa 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -271,7 +271,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         });
         //获取接班人班组组长
         Long managerId;
-        if (Func.isNotEmpty(dutyMain.getDutyGroupId())) {
+        if (Func.isNotEmpty(carryDutyMain.getDutyGroupId())) {
             ImsDutyGroupEntity groupEntity = imsDutyGroupService.getById(carryDutyMain.getDutyGroupId());
             ImsDutyGroupPEntity groupPEntity = imsDutyGroupPService.getOne(new LambdaQueryWrapper<ImsDutyGroupPEntity>() {{
                 eq(ImsDutyGroupPEntity::getGroupId, groupEntity.getId());
@@ -854,8 +854,8 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         ImsDutyMainEntity entity = new ImsDutyMainEntity();
         entity.setId(id);
         entity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
-        String format1 = DateUtil.format(new Date(), DateUtil.PATTERN_DATE);
-        Date parse = DateUtil.parse(format1, DateUtil.PATTERN_DATE);
+//        String format1 = DateUtil.format(new Date(), DateUtil.PATTERN_DATE);
+//        Date parse = DateUtil.parse(format1, DateUtil.PATTERN_DATE);
         ImsDutyMainEntity mainEntityById = imsDutyMainService.getById(id);
         ImsDutyClassEntity classEntity = imsDutyClassService.getOne(new LambdaQueryWrapper<ImsDutyClassEntity>() {{
             eq(ImsDutyClassEntity::getId, mainEntityById.getClassId());
@@ -863,7 +863,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         }});
         String dutyTime = DateUtil.format(mainEntityById.getDutyDate(), DateUtil.PATTERN_DATE) + " " +DateUtil.format(classEntity.getStartTime(), DateUtil.PATTERN_TIME);
         Date dutyDate = DateUtil.parse(dutyTime, PATTERN_DATETIME);
-        if (dutyDate.getTime() > parse.getTime()) {
+        if (dutyDate.getTime() > new Date().getTime()) {
             return R.fail("指定的值班开始时间不能晚于当前时间");
         }