提交 d6251d66 authored 作者: hzh's avatar hzh

代码优化

上级 7f260ac6
......@@ -60,7 +60,7 @@ public class ActHiTaskinst implements Serializable {
/**
* 流程执行id
*/
@TableField(value = "EXECUTION_ID")
@TableField(value = "EXECUTION_ID_")
private String executionId;
/**
......
package org.dromara.workflow.flowable.listener;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.service.IDeptService;
......@@ -11,6 +12,7 @@ import org.springframework.stereotype.Component;
import java.util.Objects;
@Component
@Slf4j
public class DynamicAssigneeListener implements TaskListener {
@Override
......@@ -24,6 +26,8 @@ public class DynamicAssigneeListener implements TaskListener {
Long approveId = deptService.selectLeaderIdByUserId(applicantId);
// 设置候选用户
delegateTask.setAssignee(Objects.isNull(approveId) ? null : approveId.toString());
String owner = Objects.isNull(approveId) ? null : approveId.toString();
delegateTask.setAssignee(owner);
}
}
......@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
......@@ -21,7 +22,6 @@ import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.system.api.model.RoleDTO;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiTaskinst;
import org.dromara.workflow.domain.WfTaskBackNode;
......@@ -224,6 +224,11 @@ public class ActTaskServiceImpl implements IActTaskService {
if (CollUtil.isEmpty(links) && StringUtils.isBlank(t.getAssignee())) {
throw new ServiceException("下一节点【" + t.getName() + "】没有办理人!");
}
ActHiTaskinst actHiTaskinst = actHiTaskinstMapper.selectById(t.getId());
if (!StringUtils.equals(actHiTaskinst.getAssignee(), t.getAssignee())) {
actHiTaskinst.setAssignee(t.getAssignee());
actHiTaskinstMapper.updateById(actHiTaskinst);
}
}
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论