红德堂-V1.2 分页参数调整

fs-user-app/src/main/java/com/fs/app/controller/ArticleController.java

@@ -56,8 +56,8 @@ public class ArticleController {
 	@Cacheable(value="getArticleList", key="#param")
 	@GetMapping("/getArticleList")
 	public R getArticleList(FsArticleListUParam param){
-		PageHelper.startPage(param.getPageNum(), param.getPageSize());
 		try {
+			PageHelper.startPage(param.getPageNum(), param.getPageSize());
 			List<FsArticleListUVO> list=articleService.selectFsArticleListUVO(param);
 			PageInfo<FsArticleListUVO> listPageInfo=new PageInfo<>(list);
 			return R.ok().put("data",listPageInfo);

fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -423,10 +423,10 @@ public class CompanyUserController extends AppBaseController {
 
     @GetMapping("/querySopVoiceList")
     public TableDataInfo querySopVoiceList(@RequestParam("recordType") Integer recordType) {
-        startPage();
         QwSopTempVoice sopTempVoice = new QwSopTempVoice();
         sopTempVoice.setRecordType(recordType);
         sopTempVoice.setCompanyUserId(getCompanyUserId());
+        startPage();
         List<QwSopTempVoice> sopTempVoices = voiceService.selectQwSopTempVoiceNewList(sopTempVoice);
         return getDataTable(sopTempVoices);
     }
@@ -469,9 +469,9 @@ public class CompanyUserController extends AppBaseController {
     @Login
     @GetMapping("/getPrescribeList")
     public R getPrescribeList(FsPrescribeListDCompanyParam param) {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setCompanyUserId(getCompanyUserId());
         param.setStatus(1);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsPrescribeListDVO> list = fsPrescribeService.selectFsPrescribeListDVOByCompanyUser(param);
         PageInfo<FsPrescribeListDVO> listPageInfo = new PageInfo<>(list);
         return R.ok().put("data", listPageInfo);
@@ -481,8 +481,9 @@ public class CompanyUserController extends AppBaseController {
     @GetMapping("/myMember")
     @ApiOperation("查询我的会员")
     public R myMember(@RequestParam(required = false) String keyword) {
+        Long companyUserId = getCompanyUserId();
         startPage();
-        List<MyMemberVO> fsUserVOS = companyUserUserService.selectFsUserByCompanyUserId(getCompanyUserId(), keyword);
+        List<MyMemberVO> fsUserVOS = companyUserUserService.selectFsUserByCompanyUserId(companyUserId, keyword);
         PageInfo<MyMemberVO> fsUserPageInfo = new PageInfo<>(fsUserVOS);
         return R.ok().put("data", fsUserPageInfo);
     }

fs-user-app/src/main/java/com/fs/app/controller/HealthRecordController.java

@@ -211,7 +211,7 @@ public class HealthRecordController extends AppBaseController
         param.setUserId(Long.parseLong(getUserId()));
         List<FsHealthDataListUVO> list = fsHealthDataService.selectFsHealthDataListUVO(param);
         PageInfo<FsHealthDataListUVO> listPageInfo=new PageInfo<>(list);
-        return R.ok().put("data",list);
+        return R.ok().put("data",listPageInfo);
     }
     @Login
     @ApiOperation("健康数据详细")

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -742,8 +742,8 @@ public class InquiryOrderController extends  AppBaseController {
     @GetMapping("/getCompanyUserInquiryOrderList")
     public R getCompanyUserInquiryOrderList(FsInquiryOrderListUParam param)
     {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setCompanyUserId(getCompanyUserId());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsInquiryOrderListUVO> list=inquiryOrderService.selectFsInquiryOrderListUVO(param);
         PageInfo<FsInquiryOrderListUVO> listPageInfo=new PageInfo<>(list);
         return R.ok().put("data",listPageInfo);

fs-user-app/src/main/java/com/fs/app/controller/PackageOrderController.java

@@ -126,8 +126,8 @@ public class PackageOrderController extends  AppBaseController {
     @ApiOperation("获取销售订单列表")
     @GetMapping("/getCompanyUserPackageOrderList")
     public R getCompanyUserPackageOrderList(FsPackageOrderListUParam param, HttpServletRequest request){
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setCompanyUserId(getCompanyUserId());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsPackageOrderListUVO> list=packageOrderService.selectFsPackageOrderListUVO(param);
         PageInfo<FsPackageOrderListUVO> listPageInfo=new PageInfo<>(list);
         return R.ok().put("data",listPageInfo);

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -212,8 +212,8 @@ public class StoreOrderController extends  AppBaseController {
     @ApiOperation("获取销售订单列表")
     @GetMapping("/getCompanyUserStoreOrderList")
     public R getCompanyUserStoreOrderList(FsStoreOrderListUParam param, HttpServletRequest request){
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setCompanyUserId(getCompanyUserId());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsStoreOrderListUVO> list=orderService.selectFsStoreOrderListUVO(param);
         PageInfo<FsStoreOrderListUVO> listPageInfo=new PageInfo<>(list);
         return R.ok().put("data",listPageInfo);

fs-user-app/src/main/java/com/fs/app/controller/store/CouponScrmController.java

@@ -49,12 +49,12 @@ public class CouponScrmController extends AppBaseController {
     @ApiOperation("获取优惠券列表")
     @GetMapping("/getCouponIssueList")
     public R getCouponIssueList(BaseQueryParam param, HttpServletRequest request){
-        PageHelper.startPage(param.getPage(), param.getPageSize());
         try {
             FsStoreCouponIssueScrm map=new FsStoreCouponIssueScrm();
             map.setIsDel(0);
             map.setCouponType(0);
             map.setStatus(1);
+            PageHelper.startPage(param.getPage(), param.getPageSize());
             List<FsStoreCouponIssueVO> list=fsStoreCouponIssueService.selectFsStoreCouponIssueListQueryVO(getUserId(),map);
             PageInfo<FsStoreCouponIssueVO> listPageInfo=new PageInfo<>(list);
             return R.ok().put("data",listPageInfo);
@@ -89,8 +89,8 @@ public class CouponScrmController extends AppBaseController {
     @ApiOperation("获取销售可用套餐卷列表")
     @GetMapping("/getCompanyCouponIssueList")
     public R getCompanyCouponIssueList(FsCouponIssueParam param, HttpServletRequest request){
-        PageHelper.startPage(param.getPage(), param.getPageSize());
         try {
+            PageHelper.startPage(param.getPage(), param.getPageSize());
             List<FsStoreCouponIssueVO> list=fsStoreCouponIssueService.getCompanyCouponIssueList(param);
             PageInfo<FsStoreCouponIssueVO> listPageInfo=new PageInfo<>(list);
             return R.ok().put("data",listPageInfo);