From cbcc5ab367a3d8b9215469e4937c2f206a554996 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 5 Jul 2024 16:45:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E4=B8=8E=E5=8F=91=E5=B8=83-=E8=B7=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=88=96=E7=A7=9F=E6=88=B7=E5=AF=BC=E5=85=A5=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1194182708789248]集成与发布-跨系统或租户导入同名系统的流水线异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1194182708789248 --- .../stephandler/component/AutomaticProcessComponent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 8b6b986b3..985dbad8d 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -380,4 +380,8 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { return 0; } + @Override + public boolean disableAssign() { + return true; + } } -- Gitee From 1bec4f9cfb8521de26cc3273ff565ad925b70b0a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 8 Jul 2024 15:57:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=80=9A=E7=9F=A5=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=9A=84=E4=B8=AA=E6=80=A7=E5=8C=96=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=80=BC=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1193513725689856]流程管理-通知策略的个性化设置，配置参数映射表单值，保存失败 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1193513725689856 --- .../process/ProcessNotifyPolicyParamList.java | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessNotifyPolicyParamList.java b/src/main/java/neatlogic/module/process/api/process/ProcessNotifyPolicyParamList.java index 755b2818f..3433f94e1 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessNotifyPolicyParamList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessNotifyPolicyParamList.java @@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.form.attribute.core.FormAttributeHandlerFactory; -import neatlogic.framework.form.attribute.core.IFormAttributeHandler; import neatlogic.framework.form.dao.mapper.FormMapper; -import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.notify.core.INotifyPolicyHandler; import neatlogic.framework.notify.core.NotifyPolicyHandlerFactory; import neatlogic.framework.notify.exception.NotifyPolicyHandlerNotFoundException; @@ -15,7 +12,6 @@ import neatlogic.framework.process.auth.PROCESS; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,7 +43,7 @@ public class ProcessNotifyPolicyParamList extends PrivateApiComponentBase { @Input({ @Param(name = "notifyPolicyHandler", type = ApiParamType.STRING, isRequired = true, desc = "通知策略处理器"), - @Param(name = "formUuid", type = ApiParamType.STRING, desc = "流程绑定表单的uuid") +// @Param(name = "formUuid", type = ApiParamType.STRING, desc = "流程绑定表单的uuid") }) @Output({ @Param(name = "tbodyList", explode = ConditionParamVo[].class, desc = "流程通知策略参数列表") @@ -64,28 +60,28 @@ public class ProcessNotifyPolicyParamList extends PrivateApiComponentBase { systemParamList.sort((e1, e2) -> e1.getName().compareToIgnoreCase(e2.getName())); List paramList = new ArrayList<>(systemParamList); // 表单条件 - String formUuid = jsonObj.getString("formUuid"); - if (StringUtils.isNotBlank(formUuid)) { - List formAttrList = formMapper.getFormAttributeList(new FormAttributeVo(formUuid)); - for (FormAttributeVo formAttributeVo : formAttrList) { - IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler()); - if (formHandler == null) { - continue; - } - if (formHandler.isConditionable()) { - ConditionParamVo conditionParamVo = new ConditionParamVo(); - conditionParamVo.setName(formAttributeVo.getUuid()); - conditionParamVo.setLabel(formAttributeVo.getLabel()); - if (formHandler.getParamType() != null) { - conditionParamVo.setParamType(formHandler.getParamType().getName()); - conditionParamVo.setParamTypeName(formHandler.getParamType().getText()); - } - conditionParamVo.setIsEditable(0); - conditionParamVo.setType("form"); - paramList.add(conditionParamVo); - } - } - } +// String formUuid = jsonObj.getString("formUuid"); +// if (StringUtils.isNotBlank(formUuid)) { +// List formAttrList = formMapper.getFormAttributeList(new FormAttributeVo(formUuid)); +// for (FormAttributeVo formAttributeVo : formAttrList) { +// IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler()); +// if (formHandler == null) { +// continue; +// } +// if (formHandler.isConditionable()) { +// ConditionParamVo conditionParamVo = new ConditionParamVo(); +// conditionParamVo.setName(formAttributeVo.getUuid()); +// conditionParamVo.setLabel(formAttributeVo.getLabel()); +// if (formHandler.getParamType() != null) { +// conditionParamVo.setParamType(formHandler.getParamType().getName()); +// conditionParamVo.setParamTypeName(formHandler.getParamType().getText()); +// } +// conditionParamVo.setIsEditable(0); +// conditionParamVo.setType("form"); +// paramList.add(conditionParamVo); +// } +// } +// } JSONObject resultObj = new JSONObject(); resultObj.put("tbodyList", paramList); return resultObj; -- Gitee From 2c4c7c78d46269655dfcbf26fdd6f0832a7b2a94 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 8 Jul 2024 16:00:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=80=9A=E7=9F=A5=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=9A=84=E4=B8=AA=E6=80=A7=E5=8C=96=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=80=BC=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1193513725689856]流程管理-通知策略的个性化设置，配置参数映射表单值，保存失败 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1193513725689856 --- .../stephandler/component/AutomaticProcessComponent.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 985dbad8d..8b6b986b3 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -380,8 +380,4 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { return 0; } - @Override - public boolean disableAssign() { - return true; - } } -- Gitee