From 5a71b861fd28452aa3f02c95e91b472cb4d804bc Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 15 Aug 2023 14:09:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/search/condition/RangeCondition.java | 2 +- .../service/impl/QuickSearchServiceImpl.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/search/condition/RangeCondition.java b/src/com/engine/organization/entity/search/condition/RangeCondition.java index 7cd57080..2dd5abb8 100644 --- a/src/com/engine/organization/entity/search/condition/RangeCondition.java +++ b/src/com/engine/organization/entity/search/condition/RangeCondition.java @@ -21,7 +21,7 @@ public class RangeCondition { private String label; private List options; private List domkey; - private List> selectLinkageDatas; + private Map selectLinkageDatas; private Integer labelcol; private Integer fieldcol; diff --git a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java index 9df7ff87..ca4f04b3 100644 --- a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java +++ b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java @@ -42,6 +42,14 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic @Override public Map getQuickSearchCondition(Map params) { Map apiDatas = new HashMap<>(16); + + QuickSearchSetting quickSearchSetting = getQuickSearchMapper().getQuickSearchSetting(user.getUID()); + if (null != quickSearchSetting) { + apiDatas.put("enable", Util.null2String(quickSearchSetting.getIsQuickSearch())); + } else { + apiDatas.put("enable", "0"); + } + List rangeConditions = new ArrayList<>(); List quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID(), LogModuleNameEnum.RESOURCE.getValue()); @@ -58,7 +66,9 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic // 字段本身值、判断有无下拉框选项 if ("4".equals(formField.getFieldHtmlType()) || "5".equals(formField.getFieldHtmlType())) { List selectItemListByFieldId = getQuickSearchMapper().getSelectItemListByFieldId(quickSearchCondition.getFieldId()); - condition.setOptions(selectItemListByFieldId.stream().map(item -> ConditionOption.builder().key(item.getSelectValue()).showname(item.getSelectName()).build()).collect(Collectors.toList())); + List options = selectItemListByFieldId.stream().map(item -> ConditionOption.builder().key(item.getSelectValue()).showname(item.getSelectName()).build()).collect(Collectors.toList()); + options.add(ConditionOption.builder().key("-1").showname("全部").build()); + condition.setOptions(options); rangeConditions.add(condition); } else { @@ -82,7 +92,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic map.put("conditionType", "RANGEPICKER"); map.put("domkey", Arrays.asList("start", "end")); selectLinkageDataMap.put("1", map); - condition.setSelectLinkageDatas(Collections.singletonList(selectLinkageDataMap)); + condition.setSelectLinkageDatas(selectLinkageDataMap); rangeConditions.add(condition); break; case 1: