fix

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

@@ -242,11 +242,9 @@ public class ApiController extends BaseController {
 			if (dto.getPageNumber() == null) {
 				return ResultUtil.error("参数pageNumber为空");
 			}
-			List<Map<String, String>> list = sapCheckService.findUserReports(dto.getStartDate(), dto.getEndDate(),
-					dto.getDepartId(), dto.getName(), dto.getState(), dto.getPageSize(), dto.getPageNumber());
-			Long total = sapCheckService.findUserReportTotal(dto.getStartDate(), dto.getEndDate(), dto.getDepartId(),
-					dto.getName(), dto.getState());
-			return ResultUtil.successPage(list, total, "操作成功");
+			Object result = sapCheckService.findUserReportPage(dto.getStartDate(), dto.getEndDate(), dto.getDepartId(),
+					dto.getName(), dto.getState(), dto.getPageSize(), dto.getPageNumber());
+			return ResultUtil.success(result, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return ResultUtil.error(ResultConstant.WEB_ERR_MSG);

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

@@ -17,14 +17,6 @@ public class ResultUtil {
 		result.put("msg", msg);
 		return result;
 	}
-	
-	public static PageData successPage(Object data, Long total, String msg) {
-		PageData result = result(true);
-		result.put("data", data);
-		result.put("total", total);
-		result.put("msg", msg);
-		return result;
-	}
 
 	public static PageData error(String msg) {
 		PageData result = result(false);

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

@@ -16,6 +16,7 @@ import org.fouram.entity.SapCheckReport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -202,6 +203,14 @@ public class SapCheckService extends BaseService {
 		return false;
 	}
 
+	public JSONObject findUserReportPage(String startDate, String endDate, String departId, String name, String state,
+			Integer pageSize, Integer pageNumber) throws Exception {
+		List<Map<String, String>> list = findUserReports(startDate, endDate, departId, name, state, pageSize,
+				pageNumber);
+		Long total = findUserReportTotal(startDate, endDate, departId, name, state);
+		return getPageResult(list, total);
+	}
+
 	@SuppressWarnings("unchecked")
 	public List<Map<String, String>> findUserReports(String startDate, String endDate, String departId, String name,
 			String state, Integer pageSize, Integer pageNumber) throws Exception {
@@ -248,4 +257,11 @@ public class SapCheckService extends BaseService {
 		pd.put("state", state);
 		return (Long) findObject("SapCheckMapper.findUserReportTotal", pd);
 	}
+	
+	public static JSONObject getPageResult(List<? extends Object> list, Object total){
+		JSONObject object = new JSONObject();
+		object.put("total", total);// 实际的行数
+		object.put("data", list);// 要以JSON格式返回
+		return object;
+	}
 }