From b9312a29cb8a3291754d322f57a65b57acc9d7b3 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 4 Jun 2024 11:44:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20E=E9=87=87=E9=80=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/docking/srms/service/impl/SrmsApiServiceImpl.java | 1 +
 .../bindPart/service/impl/LawsBindPartServiceImpl.java        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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<LawsPartStandard> partStandardQueryWrapper = new LambdaQueryWrapper<>();
         partStandardQueryWrapper.in(LawsPartStandard::getPartCategoryNum, partNumList);
+        this.syncPartStandard();
         List<LawsPartStandard> partStandardList = lawsPartStandardService.list(partStandardQueryWrapper);
         Set<String> 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<LawsBindPartMapper, Law
             }
             // 需要对所有拆分信息按照文件类型排序
             sarFileSplitInfoEOS.sort((file1, file2) -> {
-                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());