添加用户角色与用户列表判断保持一致

src/main/java/com/uas/platform/b2b/controller/MakeOrderChangeController.java

@@ -146,15 +146,14 @@ public class MakeOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
 	public ModelAndView exportChanges(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("orderChangeDate", Direction.DESC);
-		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		PageParams params = new PageParams();
+		params.setCount(JxlsExcelView.MAX_SIZE);
+		params.setPage(1);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", makeOrderChangeService.findByPageInfo(pageInfo, filter).getContent());
+		modelAndView.addObject("data", getReceivedPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeChange", "委外变更单列表_全部"));
 		logger.log("委外变更单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;