Merge remote-tracking branch 'origin/master' into master

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -207,7 +207,7 @@ public class LargeFileEndpoint {
 		// 获取文件路径
 		/**Windows文件路径要加在哪个盘**/
 //		String filePath = "D:/www/wwwroot/Users/hongchuangyanfa/Desktop/Desktop/ceshi";
-		String filePath ="D:" +ParamCache.getValue(CommonConstant.SYS_LOCAL_URL)+"largeFile/";
+		String filePath =ParamCache.getValue(CommonConstant.SYS_LOCAL_URL)+"largeFile/";
 		// 创建文件夹
 //		getAbsoluteFile(filePath, fileName);
 //		new File(filePath, fileName);
@@ -350,7 +350,7 @@ public class LargeFileEndpoint {
 	 * 构建上传完整目录
 	 */
 	private String buildUploadDir() {
-		String fullDir ="D:" +ParamCache.getValue(CommonConstant.SYS_LOCAL_URL)+"largeFile/";
+		String fullDir =ParamCache.getValue(CommonConstant.SYS_LOCAL_URL)+"largeFile/";
 		File dir = new File(fullDir);
 		if (!dir.exists()) {
 			dir.mkdirs();

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -137,8 +137,33 @@ public class ArchiveTreeContractController extends BladeController {
 		}
 		ar.setNodeName(archiveTreeContract.getNodeName());
 		ar.setFullName(archiveTreeContract.getNodeName());
-		ar.setIsStorageNode(archiveTreeContract.getIsStorageNode());
-		ar.setStorageType(archiveTreeContract.getStorageType());
+
+		if (archiveTreeContract.getIsStorageNode() != null) {
+			ar.setIsStorageNode(archiveTreeContract.getIsStorageNode());
+		}
+
+		if (archiveTreeContract.getStorageType() != null) {
+			ar.setStorageType(archiveTreeContract.getStorageType());
+		}
+
+		if (StringUtils.isNotEmpty(archiveTreeContract.getFileNumberPrefix())) {
+			ar.setFileNumberPrefix(archiveTreeContract.getFileNumberPrefix());
+		}
+		if (StringUtils.isNotEmpty(archiveTreeContract.getStorageTime())) {
+			ar.setStorageTime(archiveTreeContract.getStorageTime());
+		}
+		if (StringUtils.isNotEmpty(archiveTreeContract.getRollor())) {
+			ar.setRollor(archiveTreeContract.getRollor());
+		}
+		if (StringUtils.isNotEmpty(archiveTreeContract.getReviewer())) {
+			ar.setReviewer(archiveTreeContract.getReviewer());
+		}
+		if (StringUtils.isNotEmpty(archiveTreeContract.getSpecification())) {
+			ar.setSpecification(archiveTreeContract.getSpecification());
+		}
+		if (StringUtils.isNotEmpty(archiveTreeContract.getArchiveNameSuffix())) {
+			ar.setArchiveNameSuffix(archiveTreeContract.getArchiveNameSuffix());
+		}
 
 		return R.status(archiveTreeContractService.updateById(ar));
 	}