Antiloveg 8 years ago
parent
commit
5435f00521

+ 2 - 1
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -858,7 +858,8 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 待缴年登印费专利管理报表导出
 	 */
 	@RequestMapping(value = "/exportPending", method = RequestMethod.GET)
-	public Result exportPending(Integer locationProvince, HttpServletResponse response) {
+	public Result exportPending(@RequestParam(name = "locationProvince", required = false) Integer locationProvince,
+			HttpServletResponse response) {
 		Result res = new Result();
 		@SuppressWarnings("unchecked")
 		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(locationProvince, 1, 1000)

+ 1 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -255,7 +255,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			pageNo = 1;
 		}
 
-		if (pageSize == null || pageSize < 0 || pageSize > 10) {
+		if (pageSize == null || pageSize < 0 ) {
 			pageSize = 10;
 		}
 		return (Pagination<PatentPendingBo>) findPage("findManagePendingPaymentListByPage",