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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!487
This commit is contained in:
super_liu
2022-05-05 14:51:18 +08:00
parent a480bca0aa 26945b241c
commit f8ceedfa5b
1 changed files with 2 additions and 2 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 -2
View File
@@ -3013,7 +3013,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
StringBuilder content = new StringBuilder(""); StringBuilder content = new StringBuilder("");
for (int i = 0; i < attidlist.length; i++) { for (int i = 0; i < attidlist.length; i++) {
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) { if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]); AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
// String readFilePath = "E:\\上汽企标流程总览.pdf"; // String readFilePath = "E:\\上汽企标流程总览.pdf";
try { try {
@@ -3087,7 +3087,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
StringBuilder content = new StringBuilder(""); StringBuilder content = new StringBuilder("");
for (int i = 0; i < attidlist.length; i++) { for (int i = 0; i < attidlist.length; i++) {
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) { if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]); AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
if (null == attFileEO) { if (null == attFileEO) {
continue; continue;
} }