合并代码冲突

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
                 List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
-                String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
+                String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_STAND_ATTR_INFO");
                 if (StringUtils.isNotBlank(advanceStr)) {
                     page.setAdvanceSearchStr(advanceStr);
                 } else {
@@ -1398,7 +1398,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
         }
         page.setOrderBy("SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id");
-        //不知道从哪来的代码，疑似从Dmaster拉下来的
         if(standardsInfoExcelVO.getUserId() != null){
             page.setUserId(standardsInfoExcelVO.getUserId());
         }else {
@@ -2175,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 String txt = extractor.getText();
                                 content.append(txt);
                             }
-                       } else {
+                        } else {
                             PDDocument document = PDDocument.load(new File(readFilePath));
                             document.getClass();
                             if (!document.isEncrypted()) {