Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!316
2021-12-23 15:06:57 +08:00
parent 69f6708e56 d1cf56c660
commit 0e904d7b53
4 changed files with 20 additions and 16 deletions
@@ -400,6 +400,10 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
                    String imgUUIndex = "img" + String.valueOf(imgIndex);
                    if (StringUtils.isNotEmpty(imgContent)){
                        int pathIndex = imgContent.indexOf("src='file");
+                        if (pathIndex==-1){
+                            String sa = imgContent.replaceAll("\''","\'");
+                            pathIndex = sa.indexOf("src='file");
+                        }
                        if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
                            String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
                            String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());