[dolphinscheduler] branch dev updated: issue 8645 (#8811)

[jinyleechina]

This is an automated email from the ASF dual-hosted git repository.

jinyleechina pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new e466f54  issue 8645 (#8811)
e466f54 is described below

commit e466f54c5dd16833fc9407220cb5d3bea455f0c8
Author: zhanqian <360400...@qq.com>
AuthorDate: Thu Mar 10 20:01:44 2022 +0800

    issue 8645 (#8811)
    
    Co-authored-by: 北笙 <“zhanq...@cai-inc.com”>
    Co-authored-by: zhanqian <zhanq...@cai-inc.com>
---
 .../api/service/impl/ProcessDefinitionServiceImpl.java         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 947c6df..9f1b343 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -1108,16 +1108,20 @@ public class ProcessDefinitionServiceImpl extends 
BaseServiceImpl implements Pro
             return false;
         }
         ProcessDefinition processDefinition = 
dagDataSchedule.getProcessDefinition();
+
+        // generate import processDefinitionName
+        String processDefinitionName = 
recursionProcessDefinitionName(projectCode, processDefinition.getName(), 1);
+        String importProcessDefinitionName = processDefinitionName + 
"_import_" + DateUtils.getCurrentTimeStamp();
+
         //unique check
-        Map<String, Object> checkResult = 
verifyProcessDefinitionName(loginUser, projectCode, 
processDefinition.getName());
+        Map<String, Object> checkResult = 
verifyProcessDefinitionName(loginUser, projectCode, 
importProcessDefinitionName);
         if (Status.SUCCESS.equals(checkResult.get(Constants.STATUS))) {
             putMsg(result, Status.SUCCESS);
         } else {
             result.putAll(checkResult);
             return false;
         }
-        String processDefinitionName = 
recursionProcessDefinitionName(projectCode, processDefinition.getName(), 1);
-        processDefinition.setName(processDefinitionName + "_import_" + 
DateUtils.getCurrentTimeStamp());
+        processDefinition.setName(importProcessDefinitionName);
         processDefinition.setId(0);
         processDefinition.setProjectCode(projectCode);
         processDefinition.setUserId(loginUser.getId());