From 22adce29646846ba8f19840655c1063700c9adf3 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Thu, 4 Dec 2025 16:45:10 +0800 Subject: [PATCH] feat: fix api define --- .../main/java/com/lukouguoji/module_base/http/net/Api.kt | 2 +- .../gjc/viewModel/GjcAssembleAllocateViewModel.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt index 4a89b2c..a778eeb 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt @@ -452,7 +452,7 @@ interface Api { * 接口路径: /IntExpAssemble/allocate/pageQuery */ @POST("IntExpAssemble/allocate/pageQuery") - suspend fun getGjcAssembleAllocateList(@Body params: RequestBody): BaseResultBean> + suspend fun getGjcAssembleAllocateList(@Body params: RequestBody): PageInfo /** * 国际出港组装分配-分页合计统计 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt index 0482993..083c1fc 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt @@ -82,9 +82,9 @@ class GjcAssembleAllocateViewModel : BasePageViewModel() { launchLoadingCollect({ NetApply.api.getGjcAssembleAllocateList(listParams) }) { - onSuccess = { result -> - // 将 PageInfo 转换为 BaseListBean - result.data?.let { pageModel.handleListBean(it.toBaseListBean()) } + onSuccess = { pageInfo -> + // 直接转换为 BaseListBean + pageModel.handleListBean(pageInfo.toBaseListBean()) } }