fix

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

@@ -301,10 +301,11 @@ public class ApiController extends BaseController {
 	public Object findDepartJSON(HttpServletRequest request) throws Exception {
 		return ResultUtil.success(wxDepartService.findDepartJSON(), "操作成功");
 	}
-	
+
 	@PostMapping(value = "/findUserReports", produces = "application/json;charset=utf-8")
 	@ResponseBody
-	public Object findUserReports(HttpServletRequest request, @RequestBody FindUsersDTO dto, @RequestHeader("userId") String userId) throws Exception {
+	public Object findUserReports(HttpServletRequest request, @RequestBody FindUsersDTO dto,
+			@RequestHeader("userId") String userId) throws Exception {
 		if (dto.getPageNumber() == null) {
 			return ResultUtil.error("参数pageNumber为空");
 		}
@@ -322,7 +323,8 @@ public class ApiController extends BaseController {
 
 	@PostMapping(value = "/exportUserReportExcel")
 	@ResponseBody
-	public Object exportUserReportExcel(HttpServletResponse response, @RequestBody FindUsersDTO dto) throws Exception {
+	public Object exportUserReportExcel(HttpServletResponse response, @RequestBody FindUsersDTO dto,
+			@RequestHeader("userId") String userId) throws Exception {
 		if (StringUtils.isBlank(dto.getStartDate())) {
 			return ResultUtil.error("开始日期不可以为空");
 		}
@@ -332,6 +334,14 @@ public class ApiController extends BaseController {
 		// 清空分页查询
 		dto.setPageNumber(null);
 		dto.setPageSize(null);
+		if (StringUtils.isBlank(dto.getDepartId())) {
+			List<SapReportAuth> auths = authService.selectListByWxUserId(userId);
+			List<Long> departIds = Lists.newArrayList();
+			for (SapReportAuth auth : auths) {
+				departIds.add(auth.getWxDepartId());
+			}
+			dto.setDepartIds(departIds);
+		}
 		String ysFilePath = "/public/excel/userReport.xlsx";
 		// 汇总
 		String hzFilePath = "/public/excel/userReport" + DateUtil.getTimeStamp() + ".xlsx";