校验流程id重复

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java

@@ -468,7 +468,7 @@ public class CommonController {
 			map.put("code",0);
 			Map<String,Object> map1=new HashMap<>();
 //			map1.put("url","http://localhost:3000/jeecg-boot/sys/common/downloadFile/"+dbpath);
-			map1.put("url","http://106.15.206.14:8088/jeecg-boot/sys/common/downloadFile/"+dbpath);
+			map1.put("url","http://oa.cuidiansoft.com/jeecg-boot/sys/common/downloadFile/"+dbpath);
 			map.put("data",map1);
 		} catch (IOException e) {
 			map.put("success",false);

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActivitiModelController.java

@@ -152,10 +152,19 @@ public class ActivitiModelController {
             if(model.getProcesses().size()==0){
                 return Result.error("模型不符要求，请至少设计一条主线流程");
             }
+            //判断流程节点id是否使用了
             List<String> nodeIds = model.getProcesses().get(0).getFlowElements().stream().map(t -> t.getId()).collect(Collectors.toList());
             List<ActNode> nodeList = actNodeService.list(new QueryWrapper<ActNode>().in("node_id", nodeIds));
             if(nodeList.size()!=0){
-                return Result.error("流程id名称已经存在:"+nodeList.get(0).getNodeId());
+                String nodeIdMessge="";
+                for(ActNode actNode:nodeList){
+                    if(nodeIdMessge.equals("")){
+                        nodeIdMessge=actNode.getNodeId();
+                    }else if(nodeIdMessge.indexOf(actNode.getNodeId())==-1){
+                        nodeIdMessge=nodeIdMessge+"、"+actNode.getNodeId();
+                    }
+                }
+                return Result.error("部署失败：流程id名称已经存在，"+nodeIdMessge);
             }