diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
index 5d1cfa2..76a1950 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,6 +295,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
index 5d1cfa2..76a1950 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,6 +295,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index aba48ad..68d6612 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -37,6 +37,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,8 +295,6 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                //提前合并，分页统一处理
-                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
@@ -307,6 +306,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
index 5d1cfa2..76a1950 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,6 +295,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index aba48ad..68d6612 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -37,6 +37,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,8 +295,6 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                //提前合并，分页统一处理
-                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
@@ -307,6 +306,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 7439c20..f6e8e20 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.service.meter.IMeterFileService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
@@ -283,6 +284,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
index 5d1cfa2..76a1950 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,6 +295,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index aba48ad..68d6612 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -37,6 +37,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,8 +295,6 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                //提前合并，分页统一处理
-                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
@@ -307,6 +306,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 7439c20..f6e8e20 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.service.meter.IMeterFileService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
@@ -283,6 +284,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index a9ac979..d486e86 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.service.meter.IMeterTraceSupplierStandardEquipmentService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -311,6 +312,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
index 4e79cfd..5537674 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java
@@ -60,7 +60,6 @@
      */
     @ApiOperation("文件流下载")
     @PostMapping("/download/stream")
-    @CrossOrigin(origins = "*")
     @ResponseBody
     public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) {
         minioUtil.downloadStream(fileName, response);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
index e6c19b2..e211da1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -18,6 +18,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -98,6 +99,15 @@
         converters.add(converter);
     }
 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .maxAge(3600);
+    }
+
     /**
      * fastjson的配置
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index ed19375..6d104a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -43,6 +43,7 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -380,6 +381,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
index d72c644..f2303e3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -433,6 +434,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
index 5d1cfa2..76a1950 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,6 +295,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index aba48ad..68d6612 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -37,6 +37,7 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
@@ -294,8 +295,6 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                //提前合并，分页统一处理
-                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
@@ -307,6 +306,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 7439c20..f6e8e20 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.service.meter.IMeterFileService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
@@ -283,6 +284,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index a9ac979..d486e86 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -31,6 +31,7 @@
 import com.casic.missiles.service.meter.IMeterTraceSupplierStandardEquipmentService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -311,6 +312,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
index d14c112..fef42e5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
@@ -34,6 +34,7 @@
 import com.casic.missiles.service.meter.IMeterTrainStaffService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.PageUtil;
 import com.casic.missiles.utils.QRCodeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
@@ -344,6 +345,12 @@
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
+                //分页处理
+                if(!CollectionUtils.isEmpty(approvalList)) {
+                    Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), approvalList);
+                    page.setTotal(approvalList.size());
+                    approvalList = pages.getRecords();
+                }
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED: