配置表

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/CustomSettingApiService.java

@@ -83,6 +83,20 @@ public interface CustomSettingApiService {
     ServiceResponse<Page<Map>> page(String tableName, String searchParams, Integer currentPage, Integer pageSize);
 
     /**
+     * page
+     * @Title: page
+     * @Description:
+     * @author taogs
+     * @param tableName
+     * @param searchParamMap
+     * @param currentPage
+     * @param pageSize
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<java.util.Map<java.lang.String,java.lang.Object>>>
+     * @throws
+     */
+    ServiceResponse<Page<Map>> page(String tableName, Map<String, Object> searchParamMap, Integer currentPage, Integer pageSize);
+
+    /**
      * delete
      * @Title: delete
      * @Description:   删除

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CustomSettingApiServiceImpl.java

@@ -181,14 +181,20 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
     @Override
     public ServiceResponse<Page<Map>> page(String tableName, String searchParams, Integer currentPage, Integer pageSize) {
         log.info("page参数：{}，{}，{}，{}", tableName, searchParams, currentPage, pageSize);
+        Map<String, Object> map = JSON.parseObject(searchParams, Map.class);
+        return page(tableName, map, currentPage, pageSize);
+    }
+
+    @Override
+    public ServiceResponse<Page<Map>> page(String tableName, Map<String, Object> searchParamMap, Integer currentPage, Integer pageSize) {
+        log.info("page参数：{}，{}，{}，{}", tableName, JSON.toJSONString(searchParamMap), currentPage, pageSize);
         MongoQueryDTO queryDTO = new MongoQueryDTO();
-        if(StringUtils.isNotBlank(searchParams)){
-            Map<String, Object> map = JSON.parseObject(searchParams, Map.class);
+        if(MapUtils.isNotEmpty(searchParamMap)){
             TabTableSetting tableSetting = tableSettingService.getTableSetting(tableName);
             if(tableSetting == null){
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), tableName + "不存在");
             }
-            List<Criteria> criteriaList = getCriteriaList(map, tableSetting);
+            List<Criteria> criteriaList = getCriteriaList(searchParamMap, tableSetting);
             queryDTO.setCriteria(criteriaList);
 
         }