Merge branch 'wangdingyi' into 'dev'

车企文件上传附件

See merge request !381

quality-review/src/main/java/com/ruoyi/service/impl/ReviewEnterpriseArchiveServiceImpl.java

@@ -151,8 +151,10 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
             throw new ServiceException("新增文件名称重复，请检查", HttpStatus.ERROR);
         } else {
             // 将附件地址存入photo字段中
-            String joinUrl = StringUtils.join(reviewEnterpriseArchive.getUrl(),",");
-            reviewEnterpriseArchive.setPhoto(joinUrl);
+            if (reviewEnterpriseArchive.getUrl() != null && reviewEnterpriseArchive.getUrl().length != 0) {
+                String joinUrl = StringUtils.join(reviewEnterpriseArchive.getUrl(),",");
+                reviewEnterpriseArchive.setPhoto(joinUrl);
+            }
             reviewEnterpriseArchiveService.save(reviewEnterpriseArchive);
 
             ReviewEnterpriseArchiveFindByTaskIdRequest request = new ReviewEnterpriseArchiveFindByTaskIdRequest();
@@ -249,8 +251,10 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
     @Override
     public void editEnterpriseArchive(ReviewEnterpriseArchive reviewEnterpriseArchive) {
         // 将附件地址存入photo字段中
-        String joinUrl = StringUtils.join(reviewEnterpriseArchive.getUrl(),",");
-        reviewEnterpriseArchive.setPhoto(joinUrl);
+        if (reviewEnterpriseArchive.getUrl() != null && reviewEnterpriseArchive.getUrl().length != 0) {
+            String joinUrl = StringUtils.join(reviewEnterpriseArchive.getUrl(),",");
+            reviewEnterpriseArchive.setPhoto(joinUrl);
+        }
         reviewEnterpriseArchiveService.updateById(reviewEnterpriseArchive);
     }
 }