feat: 零部件支持多选查询

laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java

@@ -163,18 +163,22 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     public void setEnable(boolean enable) {
         ENCRYPT_ENABLE = enable;
     }
+
     @Value("${download.decrypt.url}")
     public void setDecryptUrl(String decryptUrl) {
         DECRYPT_URL = decryptUrl;
     }
+
     @Value("${download.decrypt.app_code}")
     public void setDecryptAppCode(String decryptAppCode) {
         DECRYPT_APP_CODE = decryptAppCode;
     }
+
     @Value("${download.decrypt.secret_key}")
     public void setDecryptSecretKey(String decryptSecretKey) {
         DECRYPT_SECRET_KEY = decryptSecretKey;
     }
+
     @Value("#{'${adminRoleCode}'.split(',')}")
     private List<String> adminRoleCodeList;
     @Value("#{'${enterpriseDetailRoleCode}'.split(',')}")
@@ -2391,7 +2395,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     }
 
     @NotNull
-    private List<String> getLawsPartNameStandard(String partName) {
+    private List<String> getLawsPartNameStandard(String partNames) {
+        String[] partNameIdList = partNames.split(",");
+        Set<LawsPartNameStandard> partNameStandardSet = new HashSet<>();
+        for (String partName : partNameIdList) {
             PartName targetNode = partNameService.getById(partName);
             List<PartName> resultNodeList = new ArrayList<>();
             // 获取整颗零部件树
@@ -2408,13 +2415,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
 
             LambdaQueryWrapper<LawsPartNameStandard> pnsWrapper = new LambdaQueryWrapper<>();
             pnsWrapper.in(LawsPartNameStandard::getPartNameId, resultNodeList.stream().map(PartName::getCode).collect(Collectors.toList()));
-        List<LawsPartNameStandard> partNameStandardList = partNameStandardService.list(pnsWrapper);
-
-        if (partNameStandardList.isEmpty()) {
-            return new ArrayList<>();
+            partNameStandardSet.addAll(partNameStandardService.list(pnsWrapper));
         }
-
-        return partNameStandardList.stream().map(LawsPartNameStandard::getStandardId).collect(Collectors.toList());
+        return partNameStandardSet.stream().map(LawsPartNameStandard::getStandardId).collect(Collectors.toList());
     }
 
 
@@ -2625,7 +2628,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     }
 
 
-
     @Override
     public byte[] getMinioFileContent(OSSFile file) throws Exception {
         return this.getMinioFileContentNormal(file, false);