3254194295 преди 1 година
родител
ревизия
76defea248

+ 3 - 1
platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -1055,7 +1055,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         repairApplicationFormMapper.updateByPrimaryKeySelective(form);
         // 添加状态记录
         addRepairStatusRecord(form,"维修完成待审");
-        sbMeasureLogService.addUseOrUnUseLog(dto.getId(),SbMeasureLogOtherTypeEnum.REPAIR.getValue(),"维修");
+        if(dto.getSbId()!=null) {
+            sbMeasureLogService.addUseOrUnUseLog(dto.getSbId(), SbMeasureLogOtherTypeEnum.REPAIR.getValue(), "维修");
+        }
         // 通知工程师审核
         SysUserVO vo = BeanConverterUtil.copyObjectProperties(sysUserMapper.selectByPrimaryKey(form.getDispatchUserId()),SysUserVO.class);
         sendMessageToRepairManger(form,ListUtils.newArrayList(vo),CommonConstants.REPAIR_COMPLETE_NOTICE);

+ 3 - 0
platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -61,6 +61,9 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
     @Override
     public void addUseOrUnUseLog(String sbId,Integer type,String operate) {
         SbInfo sbInfoVOS = sbInfoMapper.selectByPrimaryKey(sbId);
+        if (sbInfoVOS==null){
+            return;
+        }
         if (sbInfoVOS.getPositionId()!=null){
             SbPosition position = sbPositionMapper.selectByPrimaryKey(sbInfoVOS.getPositionId());
             if (position!=null){