From 60f811b698726b18aef013cde88b79a74ee5d6f5 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 2 Jan 2024 19:08:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20ITSM-=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1060199643709440]ITSM-条件节点条件判断逻辑不正确 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1060199643709440 --- .../handler/ProcessTaskFormAttributeCondition.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java index b8a5bd356..99fb433bd 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -17,6 +17,7 @@ package neatlogic.module.process.condition.handler; import neatlogic.framework.common.constvalue.ParamType; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dto.condition.ConditionVo; import neatlogic.framework.exception.type.ParamIrregularException; import neatlogic.framework.form.attribute.core.FormAttributeDataConversionHandlerFactory; @@ -28,6 +29,7 @@ import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; +import neatlogic.framework.form.service.IFormCrossoverService; import neatlogic.framework.fulltextindex.utils.FullTextIndexUtil; import neatlogic.framework.process.condition.core.IProcessTaskCondition; import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; @@ -252,9 +254,17 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase String formContent = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); if (StringUtils.isNotBlank(formContent)) { resultObj.put("formConfig", formContent); + IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); List processTaskFormAttributeDataList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(processTaskStepVo.getProcessTaskId()); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { - resultObj.put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); + if (java.util.Objects.equals(processTaskFormAttributeDataVo.getType(), FormHandler.FORMRADIO.getHandler()) + || java.util.Objects.equals(processTaskFormAttributeDataVo.getType(), FormHandler.FORMCHECKBOX.getHandler()) + || java.util.Objects.equals(processTaskFormAttributeDataVo.getType(), FormHandler.FORMSELECT.getHandler())) { + Object value = formCrossoverService.getFormSelectAttributeValueByOriginalValue(processTaskFormAttributeDataVo.getDataObj()); + resultObj.put(processTaskFormAttributeDataVo.getAttributeUuid(), value); + } else { + resultObj.put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); + } } } } -- Gitee