diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java index b8b80076..28458125 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java @@ -785,6 +785,7 @@ public class SrmsApiServiceImpl implements SrmsApiService { // 根据所有零部件分类码获取相关联的标准 LambdaQueryWrapper partStandardQueryWrapper = new LambdaQueryWrapper<>(); partStandardQueryWrapper.in(LawsPartStandard::getPartCategoryNum, partNumList); + this.syncPartStandard(); List partStandardList = lawsPartStandardService.list(partStandardQueryWrapper); Set standardIdSet = partStandardList.stream().map(LawsPartStandard::getStandardId).collect(Collectors.toSet()); diff --git a/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java index e93424a8..bd520453 100644 --- a/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java @@ -307,8 +307,8 @@ public class LawsBindPartServiceImpl extends ServiceImpl { - Integer order1 = orderMap.get(file1.getFileType()); - Integer order2 = orderMap.get(file2.getFileType()); + Integer order1 = orderMap.get(file1.getFileType()) != null ? orderMap.get(file1.getFileType()) : Integer.valueOf(99); + Integer order2 = orderMap.get(file2.getFileType()) != null ? orderMap.get(file2.getFileType()) : Integer.valueOf(99); return Integer.compare(order1, order2); }); standard.setInfoId(sarFileSplitInfoEOS.get(0).getId());