Merge pull request #205 from codingapi/dev

Dev

Author: xlorne

flow-engine-example/src/main/java/com/codingapi/example/entity/User.java

@@ -72,7 +72,7 @@ public String getName() {
     @Override
     @ScriptFunction(name = "isFlowManager",description = "是否为流程管理员")
     public boolean isFlowManager() {
-        return flowManager;
+        return flowManager!=null && flowManager ;
     }
 
     @Override

flow-engine-framework/src/main/java/com/codingapi/flow/manager/NodeStrategyManager.java

@@ -49,6 +49,19 @@ public boolean isEnableMergeable() {
         return false;
     }
 
+    /**
+     * 合并审批类型
+     */
+    public RecordMergeStrategy.MergeType getMergeType() {
+        List<INodeStrategy> strategies = this.strategies;
+        for (INodeStrategy strategy : strategies) {
+            if (strategy instanceof RecordMergeStrategy) {
+                return ((RecordMergeStrategy) strategy).getMergeType();
+            }
+        }
+        return RecordMergeStrategy.MergeType.APPROVER;
+    }
+
     /**
      * 是否支持撤回
      */

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/FlowRecordRepositoryMockImpl.java

@@ -10,6 +10,7 @@
 public class FlowRecordRepositoryMockImpl implements FlowRecordRepository {
 
     private final Map<Long, FlowRecord> cache = new HashMap<>();
+    private long nextId = 1;
 
     @Override
     public FlowRecord get(long id) {
@@ -45,9 +46,10 @@ public void save(FlowRecord flowRecord) {
         if (flowRecord.getId() > 0) {
             cache.put(flowRecord.getId(), flowRecord);
         } else {
-            long id = cache.size() + 1;
-            flowRecord.setId(id);
-            cache.put(id, flowRecord);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他记录（mock 模式下 generateRecordId() 返回 0，id 由仓储分配）
+            flowRecord.setId(nextId++);
+            cache.put(flowRecord.getId(), flowRecord);
         }
     }
 

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/FlowTodoMergeRepositoryMockImpl.java

@@ -10,14 +10,16 @@
 public class FlowTodoMergeRepositoryMockImpl implements FlowTodoMergeRepository {
 
     private final Map<Long, FlowTodoMerge> cache = new HashMap<>();
+    private long nextId = 1;
 
     private void save(FlowTodoMerge relation) {
         if (relation.getId() > 0) {
             cache.put(relation.getId(), relation);
         } else {
-            long id = cache.size() + 1;
-            relation.setId(id);
-            cache.put(id, relation);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他记录
+            relation.setId(nextId++);
+            cache.put(relation.getId(), relation);
         }
     }
 

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/FlowTodoRecordRepositoryMockImpl.java

@@ -11,15 +11,17 @@ public class FlowTodoRecordRepositoryMockImpl implements FlowTodoRecordRepositor
 
     private final Map<Long, FlowTodoRecord> cache = new HashMap<>();
     private final Map<String, FlowTodoRecord> cacheByMageKey = new HashMap<>();
+    private long nextId = 1;
 
     @Override
     public void save(FlowTodoRecord record) {
         if (record.getId() > 0) {
             cache.put(record.getId(), record);
         } else {
-            long id = cache.size() + 1;
-            record.setId(id);
-            cache.put(id, record);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他待办（多级流程中 B 待办删除后新建 C 待办会冲突）
+            record.setId(nextId++);
+            cache.put(record.getId(), record);
         }
         cacheByMageKey.put(record.getTodoKey(), record);
     }

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/SubProcessRepositoryMockImpl.java

@@ -10,11 +10,14 @@
 public class SubProcessRepositoryMockImpl implements SubProcessRepository {
 
     private final Map<Long, SubProcessRecord> cache = new LinkedHashMap<>();
+    private long nextId = 1;
 
     @Override
     public synchronized void save(SubProcessRecord record) {
         if (record.getId() == 0) {
-            record.setId(cache.size() + 1L);
+            // 使用单调递增 id：删除后（如有）的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他记录
+            record.setId(nextId++);
         }
         cache.put(record.getId(), record);
     }

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/UrgeIntervalRepositoryMockImpl.java

@@ -9,6 +9,7 @@
 public class UrgeIntervalRepositoryMockImpl implements UrgeIntervalRepository {
 
     private final Map<Long, UrgeInterval> cache = new HashMap<>();
+    private long nextId = 1;
 
 
     @Override
@@ -23,9 +24,10 @@ public void save(UrgeInterval urgeInterval) {
         if (urgeInterval.getId() > 0) {
             cache.put(urgeInterval.getId(), urgeInterval);
         } else {
-            long id = cache.size() + 1;
-            urgeInterval.setId(id);
-            cache.put(id, urgeInterval);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他记录
+            urgeInterval.setId(nextId++);
+            cache.put(urgeInterval.getId(), urgeInterval);
         }
     }
 }

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/WorkflowRuntimeRepositoryMockImpl.java

@@ -9,15 +9,17 @@
 public class WorkflowRuntimeRepositoryMockImpl implements WorkflowRuntimeRepository {
 
     private final Map<Long, WorkflowRuntime> cache = new HashMap<>();
+    private long nextId = 1;
 
     @Override
     public void save(WorkflowRuntime workflowRuntime) {
         if (workflowRuntime.getId() > 0) {
             cache.put(workflowRuntime.getId(), workflowRuntime);
         } else {
-            long id = cache.size() + 1;
-            workflowRuntime.setId(id);
-            cache.put(id, workflowRuntime);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他记录（WorkflowRuntime id 被 FlowRecord.workRuntimeId 引用）
+            workflowRuntime.setId(nextId++);
+            cache.put(workflowRuntime.getId(), workflowRuntime);
         }
     }
 

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/WorkflowVersionRepositoryMockImpl.java

@@ -11,6 +11,7 @@
 public class WorkflowVersionRepositoryMockImpl implements WorkflowVersionRepository {
 
     private final Map<Long, WorkflowVersion> cache = new HashMap<>();
+    private long nextId = 1;
 
     @Override
     public WorkflowVersion get(long id) {
@@ -56,9 +57,10 @@ public void save(WorkflowVersion workflowVersion) {
         if (workflowVersion.getId() > 0) {
             cache.put(workflowVersion.getId(), workflowVersion);
         } else {
-            long id = cache.size() + 1;
-            workflowVersion.setId(id);
-            cache.put(id, workflowVersion);
+            // 使用单调递增 id：删除后的 cache.size()+1 可能与已删除的 id 重复，
+            // 进而覆盖其他版本
+            workflowVersion.setId(nextId++);
+            cache.put(workflowVersion.getId(), workflowVersion);
         }
     }
 }

flow-engine-framework/src/main/java/com/codingapi/flow/node/BaseAuditNode.java

@@ -83,6 +83,7 @@ public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {
         flowRecord.setTitle(nodeStrategyManager.generateTitle(session));
         flowRecord.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
         flowRecord.setMergeable(nodeStrategyManager.isEnableMergeable());
+        flowRecord.setMergeType(nodeStrategyManager.getMergeType());
         flowRecord.newRecord();
     }