|
@@ -45,11 +45,11 @@ public class StoreProductController extends AppBaseController {
|
|
|
*/
|
|
*/
|
|
|
@ApiOperation("查询本公司下的商城产品列表")
|
|
@ApiOperation("查询本公司下的商城产品列表")
|
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
|
- public R list(Integer page, Integer pageSize, String productName,
|
|
|
|
|
|
|
+ public R list(Integer pageNum, Integer pageSize, String productName,
|
|
|
@RequestParam("companyId") Long companyId,
|
|
@RequestParam("companyId") Long companyId,
|
|
|
@RequestParam("companyUserId") Long companyUserId) {
|
|
@RequestParam("companyUserId") Long companyUserId) {
|
|
|
- if (page == null || page < 1) {
|
|
|
|
|
- page = 1;
|
|
|
|
|
|
|
+ if (pageNum == null || pageNum < 1) {
|
|
|
|
|
+ pageNum = 1;
|
|
|
}
|
|
}
|
|
|
if (pageSize == null || pageSize < 1) {
|
|
if (pageSize == null || pageSize < 1) {
|
|
|
pageSize = 10;
|
|
pageSize = 10;
|
|
@@ -57,7 +57,7 @@ public class StoreProductController extends AppBaseController {
|
|
|
if (companyId == null) {
|
|
if (companyId == null) {
|
|
|
return R.error("companyId不能为空");
|
|
return R.error("companyId不能为空");
|
|
|
}
|
|
}
|
|
|
- PageHelper.startPage(page, pageSize);
|
|
|
|
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
|
FsStoreProductScrm query = new FsStoreProductScrm();
|
|
FsStoreProductScrm query = new FsStoreProductScrm();
|
|
|
query.setIsDel(0);
|
|
query.setIsDel(0);
|
|
|
query.setIsShow(1);
|
|
query.setIsShow(1);
|