From 185a3f75ae931a0e0a6a8781cae9029adb1c9bbf Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期二, 26 九月 2023 16:31:45 +0800
Subject: [PATCH] bug修改
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
index 12f8231..59212ee 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java
@@ -12,6 +12,7 @@
import com.gkhy.exam.noncoalmine.model.vo.ViolationRegistrationVO;
import com.gkhy.exam.noncoalmine.model.vo.WorkRegistrationVO;
import com.gkhy.exam.noncoalmine.service.ViolationRegistrationService;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.file.entity.AttachmentInfo;
import com.ruoyi.file.mapper.AttachmentInfoMapper;
@@ -91,9 +92,9 @@
*/
public List<ViolationRegistrationVO> getByIdCard(String idCard,byte isCm){
List<ViolationRegistration> violationRegistrations = baseMapper.selectList(new LambdaQueryWrapper<ViolationRegistration>()
- .eq(ViolationRegistration::getDelFlag, 0)
+ .eq(ViolationRegistration::getDelFlag, (byte)0)
.eq(ViolationRegistration::getIdCard, idCard)
- .eq(idCard != null,ViolationRegistration::getIsCm,isCm));
+ .eq(ViolationRegistration::getIsCm,isCm));
List<ViolationRegistrationVO> list = violationRegistrations.stream().map(registration -> {
ViolationRegistrationVO violationRegistrationVO = new ViolationRegistrationVO();
BeanUtils.copyProperties(registration, violationRegistrationVO);
@@ -123,6 +124,9 @@
* @return
*/
private String getAttachmentUrl(String keys){
+ if(StringUtils.isEmpty(keys)){
+ return null;
+ }
String[] arry = keys.split(",");
StringBuffer paths = new StringBuffer();
List<AttachmentInfo> attachmentList = attachmentInfoService.findByKeys(Arrays.asList(arry));
--
Gitblit v1.9.2