浏览代码

修正作业票人员分配显示异常

Frankensteinly 8 月之前
父节点
当前提交
ca015a9194
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      app/src/main/java/com/grkj/iscs/view/fragment/WorkerFragment.kt

+ 2 - 2
app/src/main/java/com/grkj/iscs/view/fragment/WorkerFragment.kt

@@ -73,7 +73,7 @@ class WorkerFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> U
         mBinding?.rvLockerList?.adapter =
             object : CommonAdapter<UserListRespVO.Row>(requireActivity(), R.layout.item_rv_worker, mLockerList) {
                 override fun convert(holder: ViewHolder, user: UserListRespVO.Row, position: Int) {
-                    holder.getView<ImageView>(R.id.iv_photo).isSelected = mSelectedList.any { it.userId == user.userId }
+                    holder.getView<ImageView>(R.id.iv_photo).isSelected = mSelectedList.any { it.userId == user.userId && it.userRole == USER_ROLE_LOCKER}
                     holder.setText(R.id.tv_name, user.nickName)
                     holder.setOnClickListener(R.id.root) {
                         // 上锁人选择
@@ -94,7 +94,7 @@ class WorkerFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> U
         mBinding?.rvColockerInside?.adapter =
             object : CommonAdapter<UserListRespVO.Row>(requireActivity(), R.layout.item_rv_worker, mColockerInsideList) {
                 override fun convert(holder: ViewHolder, user: UserListRespVO.Row, position: Int) {
-                    holder.getView<ImageView>(R.id.iv_photo).isSelected = mSelectedList.any { it.userId == user.userId }
+                    holder.getView<ImageView>(R.id.iv_photo).isSelected = mSelectedList.any { it.userId == user.userId && it.userRole == USER_ROLE_COLOCKER}
                     holder.setText(R.id.tv_name, user.nickName)
                     holder.setOnClickListener(R.id.root) {
                         // 内部共锁人选择