Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -365,8 +365,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                     IOUtils.closeQuietly(os);
                     try {
                         fileItem.delete();
-                    } finally {
+                    } catch (Exception e){
-                        log.error("【核酸检测导入】删除临时描述文件失败");
+                        log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
                     }
                 }
             }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -211,10 +211,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
                 } finally {
                     IOUtils.closeQuietly(os);
-                    try {
+                    if (!fileItem.isInMemory()) {
-                        fileItem.delete();
+                        try {
-                    } finally {
+                            fileItem.delete();
-                        log.error("【疫苗接种导入】删除错误描述临时文件失败");
+                        } catch (Exception e){
+                            log.error("【疫苗接种导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
+                        }
                     }
                 }
             }