FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并代码冲突

Browse Source
This commit is contained in:
yanyizhou
2021-08-25 15:17:55 +08:00
parent a3c056cbbf
commit fe25f43063
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+2 -3
View File
@@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); 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)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
} else { } 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"); page.setOrderBy("SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id");
//不知道从哪来的代码，疑似从Dmaster拉下来的
if(standardsInfoExcelVO.getUserId() != null){ if(standardsInfoExcelVO.getUserId() != null){
page.setUserId(standardsInfoExcelVO.getUserId()); page.setUserId(standardsInfoExcelVO.getUserId());
}else { }else {
@@ -2175,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
String txt = extractor.getText(); String txt = extractor.getText();
content.append(txt); content.append(txt);
} }
} else { } else {
PDDocument document = PDDocument.load(new File(readFilePath)); PDDocument document = PDDocument.load(new File(readFilePath));
document.getClass(); document.getClass();
if (!document.isEncrypted()) { if (!document.isEncrypted()) {