Commit a5c60fbb authored by 赵啸非's avatar 赵啸非

修改部分pom

parent 2f1cf898
...@@ -454,7 +454,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -454,7 +454,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
Boolean bool1 = false; Boolean bool1 = false;
for (Comment comment : commentList) { for (Comment comment : commentList) {
if (histIns.getTaskId().equals(comment.getTaskId())) { if (!"event".equalsIgnoreCase(comment.getType())&&histIns.getTaskId().equals(comment.getTaskId())) {
flowTask.setComment(FlowCommentPdu.builder().type(comment.getType()).comment(comment.getFullMessage()).build()); flowTask.setComment(FlowCommentPdu.builder().type(comment.getType()).comment(comment.getFullMessage()).build());
bool1 = true; bool1 = true;
break; break;
...@@ -631,9 +631,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -631,9 +631,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
//如果是拒绝,则是拒绝意见 //如果是拒绝,则是拒绝意见
Map<String, Object> map = completeTaskReq.getVariables(); Map<String, Object> map = completeTaskReq.getVariables();
String bool = (String) map.getOrDefault("approve", "true"); String bool = (String) map.getOrDefault("approve", "true");
Authentication.setAuthenticatedUserId(completeTaskReq.getUserCode());
if ("true".equals(bool)) { if ("true".equals(bool)) {
taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.NORMAL.getType(), completeTaskReq.getMessage()); taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.NORMAL.getType(), completeTaskReq.getMessage());
completeTaskReq.setAction(FlowComment.NORMAL.getType()); completeTaskReq.setAction(FlowComment.NORMAL.getType());
} else { } else {
taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.REJECT.getType(), completeTaskReq.getMessage()); taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.REJECT.getType(), completeTaskReq.getMessage());
completeTaskReq.setAction(FlowComment.REJECT.getType()); completeTaskReq.setAction(FlowComment.REJECT.getType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment