Browse Source

Merge remote-tracking branch 'origin/master' into test

anderx 8 years ago
parent
commit
96f4f08c5d

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -240,7 +240,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("speciaList", speciaList);
-		return modelview;
+		return modelview; 
 	}
 
 	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)

+ 1 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -89,6 +89,7 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/listAllManagePersonalCustomer" , method = RequestMethod.POST)
 	public Result listAllManagePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
+		cli.setAid(TokenManager.getAdminId());
 		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
 		return res;
 	}