加入微信扫码支付

service-user/src/main/java/com/java110/user/api/RentingApi.java

@@ -1,6 +1,7 @@
 package com.java110.user.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.rentingConfig.RentingConfigDto;
 import com.java110.dto.rentingPool.RentingPoolDto;
@@ -247,13 +248,15 @@ public class RentingApi {
     public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId", required = false) String communityId,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row,
-                                                   @RequestParam(value = "state", required = false) String state
+                                                   @RequestParam(value = "state", required = false) String state,
+                                                   @RequestParam(value = "rentingId", required = false) String rentingId
     ) {
         RentingPoolDto rentingPoolDto = new RentingPoolDto();
         rentingPoolDto.setPage(page);
         rentingPoolDto.setRow(row);
         rentingPoolDto.setCommunityId(communityId);
-        if (state.contains(",")) {
+        rentingPoolDto.setRentingId(rentingId);
+        if (!StringUtils.isEmpty(state) && state.contains(",")) {
             rentingPoolDto.setStates(state.split(","));
         } else {
             rentingPoolDto.setState(state);