交接班代码修改

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java

@@ -1420,17 +1420,18 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             // 交接班接班信息填充
             recDTO.setStatus(DutyRecStatus.ACCEPT.getVal());
             recDTO.setAcceptTime(new Date());
-            ImsDutyLogEntity imsDutyLogEntity = recDTO.getImsDutyLogEntity();
             ImsDutyLogEntity update = imsDutyLogService.getOne(Wrappers.<ImsDutyLogEntity>lambdaQuery()
-                    .eq(ImsDutyLogEntity::getDutyId, imsDutyLogEntity.getDutyId())
+                    .eq(ImsDutyLogEntity::getDutyId, headDutyMain.getId())
                     .last("limit 1"));
-            update.setCarryTime(DateUtil.format(new Date(), PATTERN_DATETIME));
-            imsDutyLogService.updateById(update);
+            if(ObjectUtil.isNotEmpty(update)) {
+                update.setCarryTime(DateUtil.format(new Date(), PATTERN_DATETIME));
+                imsDutyLogService.updateById(update);
 //            imsDutyLogService.update(Wrappers.<ImsDutyLogEntity>lambdaUpdate()
 //                    .set(ImsDutyLogEntity::getCarryTime, DateUtil.format(new Date(), PATTERN_DATETIME))
 //                    .eq(ImsDutyLogEntity::getDutyId,imsDutyLogEntity.getDutyId())
 //            );
-            log.info("更新值班日志");
+                log.info("更新值班日志");
+            }
         }
         ImsDutyRecEntity dutyRec = BeanUtil.copy(recDTO, ImsDutyRecEntity.class);
         // 更新交班值班