diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/GspVoExtendInfoServiceImpl.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/GspVoExtendInfoServiceImpl.java index e4706826330d3f9840d646b0053bc492e09f6e3e..7921e179c4ab37bcd10098684359357ed9de55ed 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/GspVoExtendInfoServiceImpl.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/extendinfo/GspVoExtendInfoServiceImpl.java @@ -120,10 +120,8 @@ public class GspVoExtendInfoServiceImpl implements GspVoExtendInfoService { params.put("id", id); client.invoke(Void.class, getMethodString("deleteVoExtendInfo"), Lcm_SU, params, null); - if (id != null) - idGspVoExtendInfo.remove(id); - if (id == null || configIdGspVoExtendInfo == null - || configIdGspVoExtendInfo.values().size() == 0) { + idGspVoExtendInfo.remove(id); + if (configIdGspVoExtendInfo == null || configIdGspVoExtendInfo.values().size() == 0) { return; } String deleteConfigId = null; @@ -165,7 +163,6 @@ public class GspVoExtendInfoServiceImpl implements GspVoExtendInfoService { } private Type getViewModelListType() { - Type type = new Type<>(List.class, GspVoExtendInfo.class); - return type; + return new Type<>(List.class, GspVoExtendInfo.class); } } diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/helpconfig/HelpConfigFilterSortHandler.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/helpconfig/HelpConfigFilterSortHandler.java index 15b32972abb146c93af9ff377135a7599516b488..ebae3c643e22bb6ceb38ea9fb563aca44ec51c9a 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/helpconfig/HelpConfigFilterSortHandler.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/helpconfig/HelpConfigFilterSortHandler.java @@ -219,25 +219,22 @@ public class HelpConfigFilterSortHandler { mappedCdpAction.setComponentEntityId(SORT_FILTER_CMPID); mappedCdpAction.setComponentName("VO帮助前支持过滤筛选构件"); - MappedCdpActionParameter filterParameter = getPara(FILTER_CONDITION_PROPERTY, - FILTER_CONDITION_PROPERTY); + dealValue(filterCondition, mappedCdpAction, FILTER_CONDITION_PROPERTY); + + dealValue(sortCondition, mappedCdpAction, SORT_CONDITION_PROPERTY); + + return mappedCdpAction; + } + + private void dealValue(String filterCondition, MappedCdpAction mappedCdpAction, String property) { + MappedCdpActionParameter filterParameter = getPara(property, + property); ViewModelParActualValue filterValue = new ViewModelParActualValue(); filterValue.setHasValue(true); filterValue.setEnable(true); filterValue.setValue(filterCondition); filterParameter.setActualValue(filterValue); mappedCdpAction.getParameterCollection().add(filterParameter); - - MappedCdpActionParameter orderByParameter = getPara(SORT_CONDITION_PROPERTY, - SORT_CONDITION_PROPERTY); - ViewModelParActualValue orderByValue = new ViewModelParActualValue(); - orderByValue.setHasValue(true); - orderByValue.setEnable(true); - orderByValue.setValue(sortCondition); - orderByParameter.setActualValue(orderByValue); - mappedCdpAction.getParameterCollection().add(orderByParameter); - - return mappedCdpAction; } private MappedCdpActionParameter getPara(String code, String name) {