Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -133,10 +133,6 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/bidSourceList")
     public AjaxResult bidSourceList(@RequestBody JSONObject object) {
-        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        if (PageQueryLimit.pageLimit(compose.getPage())){
-            return AjaxResult.error("翻页已达到上限");
-        }
         return opportunityRadarService.bidSourceList(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

 package com.dsk.web.controller.search.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -46,14 +47,11 @@ public class CompanySearchController {
      * 完全匹配企业名称
      */
     @PostMapping("/page")
-    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult page(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        compose.getPage().setPage(compose.getPageNum());
-        compose.getPage().setLimit(compose.getPageSize());
-        compose.getPage().setField(compose.getField());
-        compose.getPage().setOrder(compose.getOrder());
-        return opportunityRadarService.enterprisePage(compose);
+        return opportunityRadarService.enterprisePage(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -26,7 +26,7 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult enterpriseByName(String keyword);
 
-    AjaxResult enterprisePage(ComposeQueryDto compose);
+    AjaxResult enterprisePage(JSONObject object);
 
     AjaxResult bondProjectPage( JSONObject object);
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -63,8 +63,8 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterprisePage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }