Merge remote-tracking branch 'origin/develop_master' into develop_master

2022-05-07 16:29:26 +08:00
parent e01952afc2 5cb0f2990d
commit adce797902
6 changed files with 30 additions and 10 deletions
@@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
            for (int i = 0; i < attidlist.length; i++) {
                if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && (attidlist[i].contains("att_file") || attidlist[i].contains("ATT_FILE"))) {
                    AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
+                    if (null == attFileEO) {
+                        continue;
+                    }
                    String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                    try {