From 61d04dce123729ced13a1f49ec80f38dc75ca657 Mon Sep 17 00:00:00 2001
From: "zijia.cj" <zijia.cj@digital-engine.com>
Date: Thu, 30 May 2024 11:11:42 +0800
Subject: [PATCH] Allow the name to remain unchanged when the template is
 modified

---
 .../DatabaseChangeChangingOrderTemplateService.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java
index 5e096593da..6778c51e4b 100644
--- a/server/odc-service/src/main/java/com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java
+++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java
@@ -191,13 +191,13 @@ public DatabaseChangeChangingOrderTemplateResp update(Long id,
                 () -> projectRepository.existsById(req.getProjectId()));
         projectPermissionValidator.checkProjectRole(req.getProjectId(), ResourceRoleName.all());
         DatabaseChangeChangingOrderTemplateEntity originEntity =
-                templateRepository.findById(id).orElseThrow(
+                templateRepository.findByIdAndProjectId(id, req.getProjectId()).orElseThrow(
                         () -> new NotFoundException(ResourceType.ODC_DATABASE_CHANGE_ORDER_TEMPLATE, "id", id));
-        Optional<DatabaseChangeChangingOrderTemplateEntity> byNameAndProjectId
-            = templateRepository.findByNameAndProjectId(req.getName(), req.getProjectId());
-        if(byNameAndProjectId.isPresent()){
+        Optional<DatabaseChangeChangingOrderTemplateEntity> byNameAndProjectId =
+                templateRepository.findByNameAndProjectId(req.getName(), req.getProjectId());
+        if (byNameAndProjectId.isPresent()) {
             PreConditions.validNoDuplicated(ResourceType.ODC_DATABASE_CHANGE_ORDER_TEMPLATE, "name", req.getName(),
-                () -> !Objects.equals(byNameAndProjectId.get().getId(), originEntity.getId()));
+                    () -> !Objects.equals(byNameAndProjectId.get().getId(), originEntity.getId()));
         }
         List<List<Long>> orders = req.getOrders();
         List<Long> databaseIds = orders.stream().flatMap(List::stream).collect(Collectors.toList());