From e8c050b6859ac3ae99dd6a2e78323d1b6eb998a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Fri, 17 Oct 2025 15:11:20 +0800 Subject: [PATCH] .. --- .../ProposalMasterUnitAssignmentHandler.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java index bce41a5e..5ef7fa69 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.proposal.handler; import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.exception.BaseException; import com.budwk.app.flow.engine.AssignmentHandler; @@ -28,14 +29,22 @@ public class ProposalMasterUnitAssignmentHandler implements AssignmentHandler { // 提案ID String proposalId = execution.getProcessInstance().getBusinessNo(); - + // 主办单位 - ProposalReplyUnit masterUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId).and(ProposalReplyUnit::getIsMaster, "=", 1)); - if (masterUnit == null) { +// ProposalReplyUnit masterUnit = dao.fetch(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "=", proposalId).and(ProposalReplyUnit::getIsMaster, "=", 1)); +// if (masterUnit == null) { +// throw new BaseException("提案没有主办单位"); +// } + +// ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, masterUnit.getUnitId()); + + String masterUnitId = execution.getArgs().getStr("tf_masterUnitId"); + + if(StrUtil.isBlank(masterUnitId)){ throw new BaseException("提案没有主办单位"); } - ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, masterUnit.getUnitId()); + ProposalUndertake undertake = dao.fetch(ProposalUndertake.class, masterUnitId); if (undertake == null) { throw new BaseException("主办单位不存在");