From 011b6c50daaaff7abfef3601b8cec167f91f267a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 20 Sep 2024 18:20:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E5=AD=90=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=86=E7=A0=81=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1250058966630400]后端-表格输入子表新增密码控件类型 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1250058966630400 --- .../process/service/ProcessStepHandlerUtil.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 249783342..5e5af823c 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -25,6 +25,8 @@ import neatlogic.framework.asynchronization.threadpool.TransactionSynchronizatio import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.exception.user.UserNotFoundException; +import neatlogic.framework.form.attribute.core.FormAttributeDataConversionHandlerFactory; +import neatlogic.framework.form.attribute.core.IFormAttributeDataConversionHandler; import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.form.dto.FormAttributeVo; @@ -1055,6 +1057,10 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess String attributeUuid = formAttributeVo.getUuid(); if (formAttributeDataMap.containsKey(attributeUuid)) { Object data = formAttributeDataMap.get(attributeUuid); + IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); + if (formAttributeDataConversionHandler != null) { + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig()); + } ProcessTaskFormAttributeDataVo formAttributeDataVo = new ProcessTaskFormAttributeDataVo(); ProcessTaskFormAttributeDataVo oldProcessTaskFormAttributeData = oldProcessTaskFormAttributeDataMap.get(attributeUuid); @@ -1130,7 +1136,12 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess if (formAttributeVo == null) { continue; } - String dataList = formExtendAttributeDataObj.getString("dataList"); + Object data = formExtendAttributeDataObj.get("dataList"); + IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); + if (formAttributeDataConversionHandler != null) { + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig()); + } + ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo(); AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(formAttributeVo.getUuid()); if (oldAttributeDataVo != null) { @@ -1142,7 +1153,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess processTaskExtendFormAttributeDataVo.setAttributeUuid(formAttributeVo.getUuid()); processTaskExtendFormAttributeDataVo.setAttributeKey(formAttributeVo.getKey()); processTaskExtendFormAttributeDataVo.setAttributeLabel(formAttributeVo.getLabel()); - processTaskExtendFormAttributeDataVo.setData(dataList); + processTaskExtendFormAttributeDataVo.setDataObj(data); // formMapper.insertFormExtendAttributeData(processTaskExtendFormAttributeDataVo); processTaskExtendFormAttributeDataVo.setProcessTaskId(processTaskId); // processTaskMapper.insertProcessTaskExtendFormAttribute(processTaskExtendFormAttributeDataVo); -- Gitee