diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java index 024a4603cf720fdd9b91d2fd921e779f3db7f833..4bdc598602df8c036dbd7bc0ffccc2b15b561b23 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java @@ -7,14 +7,9 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.config.ConfigManager; import neatlogic.framework.exception.type.PermissionDeniedException; -import neatlogic.framework.form.attribute.core.FormAttributeDataConversionHandlerFactory; -import neatlogic.framework.form.attribute.core.IFormAttributeDataConversionHandler; -import neatlogic.framework.form.dto.FormAttributeVo; -import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ItsmTenantConfig; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -27,12 +22,10 @@ import neatlogic.module.process.common.config.ProcessConfig; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.module.process.service.ProcessTaskService; -import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -118,30 +111,30 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase { protected void execute() { try { processTaskService.setProcessTaskDetail(processTaskVo); - JSONObject formConfig = processTaskVo.getFormConfig(); - if (MapUtils.isNotEmpty(formConfig)) { - FormVersionVo formVersionVo = new FormVersionVo(); - String mainSceneUuid = formConfig.getString("uuid"); - formVersionVo.setSceneUuid(mainSceneUuid); - formVersionVo.setFormConfig(formConfig); - Map formAttributeVoMap = new HashMap<>(); - List formAttributeList = formVersionVo.getFormAttributeList(); - for (FormAttributeVo formAttributeVo : formAttributeList) { - formAttributeVoMap.put(formAttributeVo.getUuid(), formAttributeVo); - } - List processTaskFormAttributeDataList = processTaskVo.getProcessTaskFormAttributeDataList(); - for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { - FormAttributeVo formAttributeVo = formAttributeVoMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); - if (formAttributeVo != null) { - IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); - if (formAttributeDataConversionHandler != null) { - Object dataObj = formAttributeDataConversionHandler.passwordMask(processTaskFormAttributeDataVo.getDataObj(), formAttributeVo.getConfig()); - processTaskFormAttributeDataVo.setDataObj(dataObj); - } - } - processTaskVo.getFormAttributeDataMap().put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); - } - } +// JSONObject formConfig = processTaskVo.getFormConfig(); +// if (MapUtils.isNotEmpty(formConfig)) { +// FormVersionVo formVersionVo = new FormVersionVo(); +// String mainSceneUuid = formConfig.getString("uuid"); +// formVersionVo.setSceneUuid(mainSceneUuid); +// formVersionVo.setFormConfig(formConfig); +// Map formAttributeVoMap = new HashMap<>(); +// List formAttributeList = formVersionVo.getFormAttributeList(); +// for (FormAttributeVo formAttributeVo : formAttributeList) { +// formAttributeVoMap.put(formAttributeVo.getUuid(), formAttributeVo); +// } +// List processTaskFormAttributeDataList = processTaskVo.getProcessTaskFormAttributeDataList(); +// for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { +// FormAttributeVo formAttributeVo = formAttributeVoMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); +// if (formAttributeVo != null) { +// IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); +// if (formAttributeDataConversionHandler != null) { +// Object dataObj = formAttributeDataConversionHandler.passwordMask(processTaskFormAttributeDataVo.getDataObj(), formAttributeVo.getConfig()); +// processTaskFormAttributeDataVo.setDataObj(dataObj); +// } +// } +// processTaskVo.getFormAttributeDataMap().put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); +// } +// } } finally { phaser.arrive(); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 9ee1d95f94ecd50faf064afe6a5046234beaa0e6..3b67593428a24e4407dcb293e6bfcf6ee10a1d14 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -1060,11 +1060,11 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess Object data = formAttributeDataMap.get(attributeUuid); IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); if (formAttributeDataConversionHandler != null) { - Object oldData = null; - if (oldProcessTaskFormAttributeData != null) { - oldData = oldProcessTaskFormAttributeData.getDataObj(); - } - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData); +// Object oldData = null; +// if (oldProcessTaskFormAttributeData != null) { +// oldData = oldProcessTaskFormAttributeData.getDataObj(); +// } + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig());//, oldData } ProcessTaskFormAttributeDataVo formAttributeDataVo = new ProcessTaskFormAttributeDataVo(); @@ -1144,11 +1144,11 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess Object data = formExtendAttributeDataObj.get("dataList"); IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); if (formAttributeDataConversionHandler != null) { - Object oldData = null; - if (oldAttributeDataVo != null) { - oldData = oldAttributeDataVo.getDataObj(); - } - data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig(), oldData); +// Object oldData = null; +// if (oldAttributeDataVo != null) { +// oldData = oldAttributeDataVo.getDataObj(); +// } + data = formAttributeDataConversionHandler.passwordEncryption(data, formAttributeVo.getConfig());// , oldData } ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo();