fix

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

@@ -18,6 +18,7 @@ import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.ExcelExportUtil;
 import org.fouram.core.util.LoggerUtil;
+import org.fouram.core.util.ResultUtil;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.service.SapCheckService;
@@ -242,7 +243,9 @@ public class ApiController extends BaseController {
 			String departId = getPageData().getString("departId");
 			String name = getPageData().getString("name");
 			String state = getPageData().getString("state");
-			return AppUtil.success(sapCheckService.findUserReports(startDate, endDate, departId, name, state), null);
+			Integer pageSize = getPageData().getInteger("pageSize");
+			Integer pageNumber = getPageData().getInteger("pageNumber");
+			return ResultUtil.success(sapCheckService.findUserReports(startDate, endDate, departId, name, state), "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
@@ -259,6 +262,8 @@ 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);
 			List<Map<String, Object>> dataList = (List<Map<String, Object>>) object;
 			String haveFilePath = "/public/excel/userReport.xlsx";

code/sapparent/sapservice/src/main/java/org/fouram/core/util/ResultUtil.java

@@ -0,0 +1,26 @@
+package org.fouram.core.util;
+
+import org.fouram.core.base.model.PageData;
+
+public class ResultUtil {
+
+	public static PageData result(boolean success) {
+		PageData result = new PageData();
+		result.put("code", "99990000");
+		result.put("success", success);
+		return result;
+	}
+
+	public static PageData success(Object data, String msg) {
+		PageData result = result(true);
+		result.put("data", data);
+		result.put("msg", msg);
+		return result;
+	}
+
+	public static PageData error(String msg) {
+		PageData result = result(false);
+		result.put("msg", msg);
+		return result;
+	}
+}

code/sapparent/sapservice/src/main/resources/spring/mybatis-config.xml

@@ -12,7 +12,7 @@
 		<!-- 驼峰转换 -->
 		<setting name="mapUnderscoreToCamelCase" value="true"/>
 		<!-- 打印查询语句 -->
-		<!-- <setting name="logImpl" value="STDOUT_LOGGING" /> -->
+		<setting name="logImpl" value="STDOUT_LOGGING" />
 	</settings>
 
 	<typeAliases>