From 277f524576142cdcea51858ce2ab9bf5e141b478 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 20 十月 2023 14:25:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/MaterialService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index a7cd19b..aa87805 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -456,8 +456,8 @@
List<String> currentFileList = new LinkedList<>();
List<String> uploadingFileList = new LinkedList<>();
- String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getId() + "-" + material.getSubCode() + "-" + material.getSubModel();
- String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getId() + "-" + material.getSubCode() + "-" + material.getSubModel();
+ String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getSubCode() + "-" + material.getSubModel();
+ String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getSubCode() + "-" + material.getSubModel();
File dirFile = new File(dirPath);
Date now = new Date();
@@ -480,6 +480,7 @@
MaterialHistory mh = new MaterialHistory();
temp.setId(material.getId());
+ mh.setProductId(-1);
mh.setMaterialId(material.getId());
int userId = ActionUtil.getUser().getId().intValue();
mh.setUpUserId(userId);
--
Gitblit v1.9.1