!63 fix(bpm): 修复节点默认审批意见 MyBatis 查询缺失列,补充条件变量原始字段返回

* fix(bpm): 修复节点默认审批意见 MyBatis 查询缺失列,补充条件变量原始字段返回
* feat(bpm): 流程节点支持配置默认审批意见,按条件变量动态选择
This commit is contained in:
wsm
2026-07-01 11:05:50 +00:00
parent a062f22aab
commit d6baa52d9f
7 changed files with 55 additions and 8 deletions
@@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import java.util.Objects;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.vo.SelectTreeModel;
@@ -72,8 +73,10 @@ public class BgXiSpeakServiceImpl extends ServiceImpl<BgXiSpeakMapper, BgXiSpeak
}
String old_pid = entity.getPid();
String new_pid = bgXiSpeak.getPid();
if(!old_pid.equals(new_pid)) {
updateOldParentNode(old_pid);
if(!Objects.equals(old_pid, new_pid)) {
if (old_pid != null) {
updateOldParentNode(old_pid);
}
if(oConvertUtils.isEmpty(new_pid)){
bgXiSpeak.setPid(IBgXiSpeakService.ROOT_PID_VALUE);
}