From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
index a816ab8..87d377f 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java
@@ -77,9 +77,9 @@
*/
public List<WorkRegistrationVO> getByIdCard(String idCard, byte isCm){
List<WorkRegistration> workRegistrations = baseMapper.selectList(new LambdaQueryWrapper<WorkRegistration>()
- .eq(WorkRegistration::getDelFlag, 0)
+ .eq(WorkRegistration::getDelFlag, (byte)0)
.eq(WorkRegistration::getIdCard, idCard)
- .eq(idCard != null,WorkRegistration::getIsCm,isCm));
+ .eq(WorkRegistration::getIsCm,isCm));
List<WorkRegistrationVO> list = workRegistrations.stream().map(workRegistration -> {
WorkRegistrationVO workRegistrationVO = new WorkRegistrationVO();
BeanUtils.copyProperties(workRegistration, workRegistrationVO);
--
Gitblit v1.9.2