From 3d94eb482d13876f91da616298c5495da895590c Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 21 Mar 2022 14:48:55 +0800 Subject: [PATCH] =?UTF-8?q?[feedback]=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/repository/Repository.kt | 1 + .../badcase/repository/net/BadCaseNetModel.kt | 2 +- .../badcase/repository/net/api/entity/BadCaseResponse.kt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kt index c559052c76..2cbd61ad87 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/Repository.kt @@ -30,6 +30,7 @@ internal class Repository { net.get(if (isDriven) "被动" else "主动", itx, 1) itx .takeIf { it.isNotEmpty() } + ?.sortedBy { it.sort } ?.also { store.updateRecords(it, isDriven) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kt index 4065bfabb5..e643ed63ef 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/BadCaseNetModel.kt @@ -25,7 +25,7 @@ internal class BadCaseNetModel { } ?.body()?.also { val data = it.data - if (data == null || it.total <= result.size) { + if (data == null || data.isEmpty() || it.total <= result.size) { return@also } result += data diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt index 7829a4d9a9..064130114a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt @@ -15,6 +15,7 @@ internal class BadCaseResponse { var id: String? = null var reason: String? = null var channel: String? = null + var sort: String? = null /** * 业务字段，不参与序列化和反序列化 @@ -23,7 +24,7 @@ internal class BadCaseResponse { var isChecked: Boolean = false override fun toString(): String { - return "Reason(id=$id, reason=$reason, channel=$channel, isChecked=$isChecked)" + return "Reason(id=$id, reason=$reason, channel=$channel, sort=$sort, isChecked=$isChecked)" } } }