|
|
@@ -313,20 +313,20 @@ class UserLogic @Inject constructor(
|
|
|
}
|
|
|
user.workstationIds = userWorkstations.map { it.workstationId }
|
|
|
user.workstationNames = userWorkstations.map { it.workstationName }
|
|
|
- user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardCode ?: ""
|
|
|
+ user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardNfc ?: ""
|
|
|
user.fingerprintSize =
|
|
|
userCharacteristicDos.groupBy { it.group }
|
|
|
.count { it.value.any { it.userId == user.userId && it.type == "1" } }
|
|
|
}
|
|
|
val nickname = userManageFilterData?.nickname
|
|
|
val status = userManageFilterData?.status
|
|
|
- val cardCode = userManageFilterData?.cardCode
|
|
|
+ val cardNfc = userManageFilterData?.cardNfc
|
|
|
val workstationName = userManageFilterData?.workstationName
|
|
|
|
|
|
val filteredList = userManageVos.filter { user ->
|
|
|
(nickname.isNullOrEmpty() || user.nickName.contains(nickname)) &&
|
|
|
(status == null || user.status == (if (status) "1" else "0")) &&
|
|
|
- (cardCode.isNullOrEmpty() || user.cardNfc.contains(cardCode)) &&
|
|
|
+ (cardNfc.isNullOrEmpty() || user.cardNfc.contains(cardNfc)) &&
|
|
|
(workstationName.isNullOrEmpty() || user.workstationNames.any {
|
|
|
it?.contains(
|
|
|
workstationName
|
|
|
@@ -405,7 +405,7 @@ class UserLogic @Inject constructor(
|
|
|
}
|
|
|
user.workstationIds = userWorkstations.map { it.workstationId }
|
|
|
user.workstationNames = userWorkstations.map { it.workstationName }
|
|
|
- user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardCode ?: ""
|
|
|
+ user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardNfc ?: ""
|
|
|
user.fingerprintSize =
|
|
|
userCharacteristicDos.count { it.userId == user.userId && it.type == "1" }
|
|
|
}
|