fix

code/sapparent/sapcms/src/main/java/org/fouram/WebConfigurer.java

@@ -1,17 +1,17 @@
 package org.fouram;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @description:
  * @Author: Andy.Han

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -229,7 +229,7 @@ public class ApiController extends BaseController {
 			return ResultUtil.success(wxDepartService.findDepartJSON(), "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
-			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+			return ResultUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
 
@@ -245,10 +245,18 @@ public class ApiController extends BaseController {
 			String state = getPageData().getString("state");
 			Integer pageSize = getPageData().getInteger("pageSize");
 			Integer pageNumber = getPageData().getInteger("pageNumber");
-			return ResultUtil.success(sapCheckService.findUserReports(startDate, endDate, departId, name, state), "操作成功");
+			if(pageSize == null) {
+				return ResultUtil.error("参数pageSize为空");
+			}
+			if(pageNumber == null) {
+				return ResultUtil.error("参数pageNumber为空");
+			}
+			Object result = sapCheckService.findUserReports(startDate, endDate, departId, name, state, pageSize,
+					pageNumber);
+			return ResultUtil.success(result, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
-			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+			return ResultUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
 
@@ -262,9 +270,7 @@ public class ApiController extends BaseController {
 			String departId = getPageData().getString("departId");
 			String name = getPageData().getString("name");
 			String state = getPageData().getString("state");
-			Integer pageSize = getPageData().getInteger("pageSize");
-			Integer pageNumber = getPageData().getInteger("pageNumber");
-			Object object = sapCheckService.findUserReports(startDate, endDate, departId, name, state);
+			Object object = sapCheckService.findUserReports(startDate, endDate, departId, name, state, null, null);
 			List<Map<String, Object>> dataList = (List<Map<String, Object>>) object;
 			String haveFilePath = "/public/excel/userReport.xlsx";
 			ExcelExportUtil.exportExcelStream(getRootPath() + haveFilePath, dataList, 1, response);

code/sapparent/sapservice/src/main/java/org/fouram/core/filter/CorsFilter.java

@@ -8,7 +8,6 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * 支持跨域filter

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckMapper.xml

@@ -170,5 +170,8 @@
 			and a.result = #{state} 
 		</if>
 		order by a.userId, a.checkinDay 
+		<if test="pageCurrent != null and pageCurrent != ''">
+			limit ${pageCurrent},${pageNumber}
+		</if>
 	</select>
 </mapper>

code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -210,8 +210,8 @@ public class SapCheckService extends BaseService {
 		return false;
 	}
 
-	public Object findUserReports(String startDate, String endDate, String departId, String name, String state)
-			throws Exception {
+	public Object findUserReports(String startDate, String endDate, String departId, String name, String state,
+			Integer pageSize, Integer pageNumber) throws Exception {
 		if (StringUtils.isNotBlank(departId) && departId.endsWith(",")) {
 			departId = departId.substring(0, departId.length() - 1);
 		}
@@ -228,6 +228,10 @@ public class SapCheckService extends BaseService {
 		pd.put("departId", departId);
 		pd.put("name", name);
 		pd.put("state", state);
+		if(pageSize != null) {
+			pd.put("pageCurrent", String.valueOf(pageSize * (pageNumber - 1)));
+			pd.put("pageNumber", String.valueOf(pageNumber));
+		}
 		return findList("SapCheckMapper.findUserReports", pd);
 	}
 }