Explorar o código

feat(优化)
- 作业删除的逻辑判断优化

周文健 hai 10 meses
pai
achega
47d5984604

+ 8 - 3
app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageFragment.kt

@@ -67,7 +67,12 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
             PopTip.build().tip(R.string.please_select_job)
             return
         }
-        if (viewModel.jobManageDataList.any { it.ticketStatus !in listOf(JobTicketStatusEnum.CANCELED.status, JobTicketStatusEnum.FINISHED.status) }){
+        if (viewModel.jobManageDataList.filter { it.isSelected }.any {
+                it.ticketStatus !in listOf(
+                    JobTicketStatusEnum.CANCELED.status,
+                    JobTicketStatusEnum.FINISHED.status
+                )
+            }) {
             TipDialog.showError(getString(R.string.has_job_in_progress))
             return
         }
@@ -162,9 +167,9 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
             }
             binding.refreshLayout.finishRefresh()
             binding.refreshLayout.finishLoadMore()
-            if (viewModel.jobManageDataList.isEmpty()){
+            if (viewModel.jobManageDataList.isEmpty()) {
                 binding.state.showEmpty()
-            }else{
+            } else {
                 binding.state.showContent()
             }
             binding.listRv.models = viewModel.jobManageDataList