小区下载照片问题修复

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZAreaServiceImpl.java

@@ -422,12 +422,13 @@ public class ZAreaServiceImpl implements IZAreaService {
      * 图片下载
      */
     @Override
-    public void upload(HttpServletRequest request, HttpServletResponse response, String name) {
+    public void upload(HttpServletRequest request, HttpServletResponse response, String id) {
+        ZAreaVo vo =baseMapper.selectVoById(id);
         // 设置文件夹时间戳和路径位置
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String format = sdf.format(new Date());
         // 文件夹的路径，写入服务器的 /tmp 文件夹下
-        String filePath = path + name;
+        String filePath = path + vo.getName();
         // 导出的zip路径
         String zipFilePath = path + "tmp_" + format + ".zip";
         // 导出的zip名字

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngiineeringPhotoServiceImpl.java

@@ -277,13 +277,13 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
                         if (!file.exists()) {
                             file.mkdirs();
                         }
-                        // 创建行政区
-                        File headFile = new File(file.getPath() + "/" + zEngineeringCivilBo.getDistrict());
-                        if (!headFile.exists()) {
-                            headFile.mkdirs();
-                        }
+//                        // 创建行政区
+//                        File headFile = new File(file.getPath() + "/" + zEngineeringCivilBo.getDistrict());
+//                        if (!headFile.exists()) {
+//                            headFile.mkdirs();
+//                        }
                         // 小区下再次创建小区，本级用于导出
-                        File areaFile = new File(headFile.getPath() + "/" + zEngineeringCivilBo.getAreaId());
+                        File areaFile = new File(file.getPath() + "/" + zEngineeringCivilBo.getAreaId());
                         if (!areaFile.exists()) {
                             areaFile.mkdirs();
                         }