userw

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManagerImpl.java

@@ -100,7 +100,7 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
         for (QtkServiceHall qtkServiceHall : all) {
             if (qtkServiceHall.getSuperServiceHallId() == null) {
                 top.add(qtkServiceHall);
-            }else {
+            } else {
                 son.add(qtkServiceHall);
             }
         }
@@ -251,8 +251,7 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
     @Override
     public String registerFullBath(ServiceHallRegisterFullBatchRequestDTO reqDto) throws ManagerException {
         String path = null;
-        File tempFile = null;
-        tempFile = minioUtil.getFileByUrl(reqDto.getExcelFileUrl());
+        File tempFile = minioUtil.getFileByUrl(reqDto.getExcelFileUrl());
         //获取文件流
         InputStream fileInputStream = null;
         try {
@@ -282,7 +281,7 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
                     .doWrite(errors);
             path = minioUtil.fileUploadHttp(upFile, BucketFileBus.SERVICEHALL);
         }
-        return path;
+        return path == null ? null : minioUtil.getOuterUrl(path);
     }
 
     @Override
@@ -325,7 +324,7 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
 
         //删除临时文件
         FileUtil.del(tempFile);
-        return path;
+        return path == null ? null : minioUtil.getOuterUrl(path);
     }
 
     private Long getServiceHallId(String agencyId) {