From c1496d8a74ef69253d1873602a467ca61876bbfb Mon Sep 17 00:00:00 2001
From: Tandoy <56899730+Tandoy@users.noreply.github.com>
Date: Thu, 16 Sep 2021 09:45:44 +0800
Subject: [PATCH] [Bug] [ui] fix cannot edit project (#6227)

* fix cannot edit project

* It has been fixed that when editing a project, if you do not modify the projectName, a project already exists error will be thrown.
---
 .../dolphinscheduler/api/service/impl/ProjectServiceImpl.java   | 2 +-
 .../home/pages/projects/pages/list/_source/createProject.vue    | 2 +-
 dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index 80603ef3a..7d49cfaae 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -296,7 +296,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
             return result;
         }
         Project tempProject = projectMapper.queryByName(projectName);
-        if (tempProject != null) {
+        if (tempProject != null && tempProject.getCode() != project.getCode()) {
             putMsg(result, Status.PROJECT_ALREADY_EXISTS, projectName);
             return result;
         }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
index 064c1e7f0..a49be0e32 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
@@ -92,7 +92,7 @@
 
         // edit
         if (this.item) {
-          param.projectId = this.item.id
+          param.projectCode = this.item.code
         }
 
         this.$refs.popover.spinnerLoading = true
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js
index 5310397da..f430a024b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js
@@ -71,7 +71,7 @@ export default {
    */
   updateProjects ({ state }, payload) {
     return new Promise((resolve, reject) => {
-      io.put(`projects/${payload.projectId}`, payload, res => {
+      io.put(`projects/${payload.projectCode}`, payload, res => {
         resolve(res)
       }).catch(e => {
         reject(e)
-- 
GitLab