wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 审批人去重后, 调整审批日志处理逻辑

Browse Source
This commit is contained in:
wangli 2024-01-10 11:10:13 +08:00
parent 0722995947
commit 5cf4cb8be4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
View File

@ -40,6 +40,7 @@ public interface BpmnConstants {
String DUMMY_ASSIGNEE_ID = NO_TENANT_ID + "|" + DUMMY_ASSIGNEE + "|" + DUMMY_ASSIGNEE_TYPE;
String ROBOT_ASSIGNEE_ID = NO_TENANT_ID + "|" + ROBOT_ASSIGNEE + "|" + ROBOT_ASSIGNEE_TYPE;
String HIDDEN_ASSIGNEE_ID = NO_TENANT_ID + "|hidden|" + TASK_ASSIGNEE_SKIP_FLAT;
String NO_ASSIGNEE = "|";
String FLOW_NODE_JSON = "jsonValue";
String FLOW_SERVER_VERSION = "serverVersion";
String FLOW_SERVER_VERSION_121 = "1.2.1";

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java
View File

@ -104,7 +104,7 @@ public class BpmnTaskDelegateAssigner implements Serializable {
public static BpmnTaskDelegateAssigner buildDummyAssigner(String assignee,
String assigneeType,
String assignerName) {
return buildDummyAssigner(assignee, assigneeType, assignerName, "0", "0", NO_TENANT_ID);
return buildDummyAssigner(assignee, assigneeType, assignerName, "", "", NO_TENANT_ID);
}
public static BpmnTaskDelegateAssigner buildDummyAssigner(String assignee,

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -89,8 +89,8 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_COMMEN
import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_INFO;
import static cn.axzo.workflow.common.constant.BpmnConstants.NO_ASSIGNEE;
import static cn.axzo.workflow.common.constant.BpmnConstants.OLD_INTERNAL_TASK_RELATION_ASSIGNEE_INFO_SNAPSHOT;
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT;
import static cn.axzo.workflow.common.enums.BpmnCountersignTypeEnum.SHARE_COUNTERSIGN;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.APPROVED;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCESSING;
@ -381,10 +381,9 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
BpmnTaskDelegateAssigner assigner = Objects.nonNull(assginerSnapshot) ?
(BpmnTaskDelegateAssigner) assginerSnapshot.getValue() : null;
if (StringUtils.hasLength(vo.getAssignee()) && !vo.getAssignee().contains(TASK_ASSIGNEE_SKIP_FLAT)) {
vo.setAssignee(Objects.isNull(assigner) ? "" : assigner.getAssignee());
if (Objects.nonNull(assigner) && !Objects.equals(assigner.buildAssigneeId(), NO_ASSIGNEE)) {
vo.setAssigneeSnapshot(assigner);
}
vo.setAssigneeSnapshot(assigner);
}
return vos;
}