huangtf 2 anos atrás
pai
commit
6682001e67

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

@@ -113,10 +113,6 @@ public class ArchiveTreeContractController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入archiveTreeContractDTO")
 	public R save(@Valid @RequestBody ArchiveTreeContractDTO archiveTreeContractDTO) {
 
-		if (archiveTreeContractDTO.getProjectId() == null) {
-			archiveTreeContractDTO.setProjectId(1578599210897772545L);
-		}
-
 		if (archiveTreeContractService.submit(archiveTreeContractDTO)) {
 			CacheUtil.clear(SYS_CACHE);
 			return R.data(archiveTreeContractDTO);
@@ -131,8 +127,20 @@ public class ArchiveTreeContractController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入archiveTreeContract")
 	public R update(@Valid @RequestBody ArchiveTreeContract archiveTreeContract) {
-		archiveTreeContract.setFullName(archiveTreeContract.getNodeName());
-		return R.status(archiveTreeContractService.updateById(archiveTreeContract));
+		if (archiveTreeContract == null ) {
+			return  R.fail(200, "未查询到对应节点信息");
+		}
+
+		ArchiveTreeContract ar = archiveTreeContractService.getById(archiveTreeContract.getId());
+		if (ar == null) {
+			return  R.fail(200, "未查询到对应节点信息");
+		}
+		ar.setNodeName(archiveTreeContract.getNodeName());
+		ar.setFullName(archiveTreeContract.getNodeName());
+		ar.setIsStorageNode(archiveTreeContract.getIsStorageNode());
+		ar.setStorageType(archiveTreeContract.getStorageType());
+
+		return R.status(archiveTreeContractService.updateById(ar));
 	}
 
 	/**