xiongchao 3 gadi atpakaļ
vecāks
revīzija
f6231195a0

+ 2 - 2
platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -357,10 +357,10 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
                 String fileSbNo = items.get(0).getNo();
                 Weekend<SbInfo> weekend = new Weekend<>(SbInfo.class);
                 WeekendCriteria<SbInfo, Object> weekendCriteria = weekend.weekendCriteria();
-                weekendCriteria.andEqualTo(SbInfo::getNo, fileSbNo);
+                weekendCriteria.andEqualTo(SbInfo::getNo, fileSbNo).orEqualTo(SbInfo::getZbh, fileSbNo);
                 SbInfo sbInfo = sbInfoMapper.selectOneByExample(weekend);
                 if(sbInfo == null){
-                    throw new BusinessException("新号查不到,请确保编号正确" + ", 导入文件中的设备新号:" + fileSbNo);
+                    throw new BusinessException("查不到设备,请确保编号正确" + ", 导入文件中的号:" + fileSbNo);
                 }
                 List<CheckStandard> addItems = new ArrayList<CheckStandard>();
                 List<SysUser> users = sysUserMapper.selectAll();