diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/btncommand/receiver/ButtonReceiverList.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/btncommand/receiver/ButtonReceiverList.java index 4b9e07a..3430a6b 100644 --- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/btncommand/receiver/ButtonReceiverList.java +++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/btncommand/receiver/ButtonReceiverList.java @@ -13,7 +13,9 @@ http://www.apache.org/licenses/ */ package com.jeelowcode.core.framework.config.btncommand.receiver; +import com.jeelowcode.core.framework.utils.Func; import com.jeelowcode.framework.utils.adapter.IJeeLowCodeAdapter; +import com.jeelowcode.framework.utils.enums.ParamEnum; import com.jeelowcode.framework.utils.model.ResultDataModel; import com.jeelowcode.framework.utils.tool.spring.SpringUtils; import com.jeelowcode.core.framework.config.btncommand.param.ButtonParamList; @@ -53,6 +55,9 @@ public class ButtonReceiverList extends ButtonReceiverBase implements IButtonCom Long dbformId = param.getDbFormId(); Map params = param.getParams(); + if(Func.isNotEmpty(params)){ + params.remove(ParamEnum.ALL_QUERY_FIELD.getCode());//特殊字段不允许用户带过来 + } Page page = param.getPage(); ResultDataModel resultDataModel = frameService.getDataList(dbformId, page, params); diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/controller/DbFormController.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/controller/DbFormController.java index 55937c5..6ef79b2 100644 --- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/controller/DbFormController.java +++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/controller/DbFormController.java @@ -257,6 +257,7 @@ public class DbFormController extends BaseController { params.put(code,dataId);//id=1 params.put(ParamEnum.PAGE_NO.getCode(),1); params.put(ParamEnum.PAGE_SIZE.getCode(),1000); + params.put(ParamEnum.ALL_QUERY_FIELD.getCode(),"Y"); ResultDataModel model = frameService.getDataList(dbformId, params); List> tmpList = model.getRecords(); if(Func.isEmpty(tmpList)){ diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/mapper/JeeLowCodeMapper.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/mapper/JeeLowCodeMapper.java index eb3a7cf..8bc562e 100644 --- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/mapper/JeeLowCodeMapper.java +++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/mapper/JeeLowCodeMapper.java @@ -33,6 +33,9 @@ public interface JeeLowCodeMapper { @JeelowCodeCache(cacheNames = "'JeeLowCodeMapper:getDbWhereFieldList:' + #dbFormId", reflexClass = Map.class,nullIsSave = true) List> getDbWhereFieldList(Long dbFormId); + @JeelowCodeCache(cacheNames = "'JeeLowCodeMapper:getAllDbWhereFieldList:' + #dbFormId", reflexClass = Map.class,nullIsSave = true) + List> getAllDbWhereFieldList(Long dbFormId); + //获取开启搜索列-数据报表 @JeelowCodeCache(cacheNames = "'JeeLowCodeMapper:getReportWhereFieldList:' + #reportId", reflexClass = Map.class,nullIsSave=true) List> getReportWhereFieldList(Long reportId); diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/service/impl/FrameServiceImpl.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/service/impl/FrameServiceImpl.java index 2a85896..e7fb65b 100644 --- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/service/impl/FrameServiceImpl.java +++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/service/impl/FrameServiceImpl.java @@ -1130,7 +1130,14 @@ public class FrameServiceImpl implements IFrameService { //处理where private void handleWhere(Long dbFormId, SqlInfoQueryWrapper.Wrapper wrapper, Map params) { - List> whereFieldMapList = jeeLowCodeMapper.getDbWhereFieldList(dbFormId); + String allQueryField = Func.getMap2Str(params, ParamEnum.ALL_QUERY_FIELD.getCode()); + List> whereFieldMapList =null; + if(Func.isNotEmpty(allQueryField) && Func.equals(allQueryField,"Y")){ + //特殊情况,是全部放开 + whereFieldMapList = jeeLowCodeMapper.getAllDbWhereFieldList(dbFormId); + }else{ + whereFieldMapList = jeeLowCodeMapper.getDbWhereFieldList(dbFormId); + } handleWhere(whereFieldMapList, wrapper, params); } diff --git a/jeelowcode-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml b/jeelowcode-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml index 40cd6ae..cfb2e4c 100644 --- a/jeelowcode-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml +++ b/jeelowcode-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml @@ -39,6 +39,26 @@ field.id ASC + +