分页构造调整

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/service/impl/HlgAccountDetailServiceImpl.java

@@ -737,7 +737,7 @@ public class HlgAccountDetailServiceImpl extends ServiceImpl<HlgAccountDetailMap
      */
     @Override
     public Page<HlgAccountDetail> pageManagerListApi(Integer pageNo, Integer pageSize, HlgAccountDetail hlgAccountDetail, HttpServletRequest req) {
-        Page<HlgAccountDetail> page = new Page<>();
+        Page<HlgAccountDetail> page = new Page<>(pageNo, pageSize);
         //收支明细列表
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companyAccountDetailList;

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentDetailServiceImpl.java

@@ -149,7 +149,7 @@ public class HlgPaymentDetailServiceImpl extends ServiceImpl<HlgPaymentDetailMap
      */
     @Override
     public Page<HlgPaymentDetail> pageListApi(Integer pageNo, Integer pageSize, HlgPaymentDetail hlgPaymentDetail, HttpServletRequest req) {
-        Page<HlgPaymentDetail> page = new Page<>();
+        Page<HlgPaymentDetail> page = new Page<>(pageNo, pageSize);
         //付款申请详情列表信息
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.paymentDetailList;

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -892,7 +892,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                             hlgUser1.setName(name);
                             hlgUser1.setIdcardNumber(idcardNumber);
                             userList.add(hlgUser1);
-                        }else{
+                        } else {
                             userListTotal.add(hlgUser);
                         }
                     } else {
@@ -1066,13 +1066,13 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
 //            }
 //        }
         if (hlgPaymentDetailList.size() > 0) {
-            String message=savePayment(hlgPaymentDetailList, hlgPayment, userList);
-            if("60天内已存在相同笔数相同金额的付款".equals(message)){
+            String message = savePayment(hlgPaymentDetailList, hlgPayment, userList);
+            if ("60天内已存在相同笔数相同金额的付款".equals(message)) {
                 Map map2 = new HashMap();
                 map2.put("reason", "60天内已存在相同笔数相同金额的付款");
                 resultlist.add(map2);
             }
-            if(userListTotal.size()>0){
+            if (userListTotal.size() > 0) {
                 hlgUserService.updateBatchById(userListTotal);
             }
         }
@@ -1375,8 +1375,8 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
         jsonObject1.put("subcontractorId", hlgPayment.getSubcontractorId());
         jsonObject1.put("cpType", hlgPayment.getCpType());
         jsonObject1.put("companyCode", hlgCompany.getCompanyCode());
-        jsonObject1.put("sumMoney",sumMoney);
-        jsonObject1.put("paymentSize",hlgPaymentDetailList.size());
+        jsonObject1.put("sumMoney", sumMoney);
+        jsonObject1.put("paymentSize", hlgPaymentDetailList.size());
         log.info("param============{}", JSONObject.toJSONString(jsonObject1));
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(jsonObject1));
@@ -1392,7 +1392,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                     hlgUser.setUserCode(list1.get(i).get("userCode").toString());
                     hlgUserService.updateById(hlgUser);
                 }
-                String message=jsonObject.getString("message");
+                String message = jsonObject.getString("message");
                 return message;
             } else {
                 String message = jsonObject.getString("message");
@@ -1451,7 +1451,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
      */
     @Override
     public Page<HlgPayment> pageListApi(Integer pageNo, Integer pageSize, HlgPayment hlgPayment, HttpServletRequest request) {
-        Page<HlgPayment> page = new Page<>();
+        Page<HlgPayment> page = new Page<>(pageNo, pageSize);
         //获取请求路由路径
         String routeUrl = request.getServletPath();
         //获取当前登录用户