Browse Source

fix bug: cannot delete global_params field when updating definition

pull/2/head
baoliang 6 years ago
parent
commit
dc1c4d0255
  1. 6
      escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

6
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

@ -293,12 +293,12 @@ public class ProcessDefinitionService extends BaseDAGService {
processDefine.setTimeout(processData.getTimeout()); processDefine.setTimeout(processData.getTimeout());
//custom global params //custom global params
List<Property> globalParamsList = processData.getGlobalParams(); List<Property> globalParamsList = new ArrayList<>();
if (globalParamsList != null && globalParamsList.size() > 0) { if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) {
Set<Property> userDefParamsSet = new HashSet<>(globalParamsList); Set<Property> userDefParamsSet = new HashSet<>(globalParamsList);
globalParamsList = new ArrayList<>(userDefParamsSet); globalParamsList = new ArrayList<>(userDefParamsSet);
processDefine.setGlobalParamList(globalParamsList);
} }
processDefine.setGlobalParamList(globalParamsList);
processDefine.setUpdateTime(now); processDefine.setUpdateTime(now);
processDefine.setFlag(Flag.YES); processDefine.setFlag(Flag.YES);
if (processDefineMapper.update(processDefine) > 0) { if (processDefineMapper.update(processDefine) > 0) {

Loading…
Cancel
Save