根据机构过滤类别

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/PayBaseWatercategoryController.java

@@ -49,9 +49,9 @@ public class PayBaseWatercategoryController {
 
     @GetMapping("/getAll")
     @ApiOperation(value = "查询所有用水类别,不分页",notes = "查询所有用水类别,不分页")
-    public AjaxMessage<List<PayBaseWatercategoryDto>>getAll()
+    public AjaxMessage<List<PayBaseWatercategoryDto>>getAll(@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer companyId)
     {
-        List<PayBaseWatercategoryDto> payBaseWatercategoryDtoList = payBaseWatercategoryService.getAll();
+        List<PayBaseWatercategoryDto> payBaseWatercategoryDtoList = payBaseWatercategoryService.getAll(companyId);
         return new AjaxMessage<>(ResultStatus.OK,payBaseWatercategoryDtoList);
     }
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayBaseWatercategoryServiceImpl.java

@@ -37,10 +37,10 @@ public class PayBaseWatercategoryServiceImpl implements PayBaseWatercategoryServ
         return new Pagination<>(payBaseWatercategoryDtoList);
     }
     @Override
-    public List<PayBaseWatercategoryDto> getAll()
+    public List<PayBaseWatercategoryDto> getAll(Integer companyId)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        return payBaseWatercategoryMapper.getAll(null,loginUser.getTenantId(), null);
+        return payBaseWatercategoryMapper.getAll(null,loginUser.getTenantId(), companyId);
     }
 
     @Override

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/PayBaseWatercategoryService.java

@@ -21,5 +21,5 @@ public interface PayBaseWatercategoryService {
     Pagination<PayBaseWatercategoryDto> getAll(String name, int pageNum, int pageSize,Integer companyId);
 
     //是查询所有用水类别,不分页
-    List<PayBaseWatercategoryDto>getAll();
+    List<PayBaseWatercategoryDto>getAll(Integer companyId);
 }