From 051deb72b71b3f58a9986dff0a60740ab04c7102 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 24 Nov 2025 15:47:53 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/UserQualificationInfoAddExe.java | 2 +- .../basic/info/command/UserQualificationInfoUpdateExe.java | 2 +- .../info/command/query/UserQualificationInfoQueryExe.java | 3 ++- .../basic/info/domain/model/UserQualificationInfoE.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java index dce0919..cd75b77 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java @@ -32,7 +32,7 @@ public class UserQualificationInfoAddExe { UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE(); // 证书编号验重 List list = userQualificationInfoRepository.listByCertificateNo(cmd.getCertificateNo()); - userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class)); + userQualificationInfoE.checkNull(list == null ? 0 : list.size()); BeanUtils.copyProperties(cmd, userQualificationInfoE); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java index ee77d28..9ded8b6 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java @@ -33,7 +33,7 @@ public class UserQualificationInfoUpdateExe { // 证书编号验重 List list = userQualificationInfoRepository.listByIdAndCertificateNo(cmd.getId(), cmd.getCertificateNo()); - userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class)); + userQualificationInfoE.checkNull(list == null ? 0 : list.size()); BeanUtils.copyProperties(cmd, userQualificationInfoE); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java index 57ff05c..0f9c5a4 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java @@ -13,6 +13,7 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -56,7 +57,7 @@ public class UserQualificationInfoQueryExe { List examCenterCOS = userQualificationInfoCoConvertor.converDOsToCOs(listResponse.getData()); return MultiResponse.of(examCenterCOS); }else { - return MultiResponse.of(null); + return MultiResponse.of(new ArrayList<>()); } } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java index 7ff78c0..ffae30c 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java @@ -73,8 +73,8 @@ public class UserQualificationInfoE extends BaseE { private String env; // 验重 - public void checkNull(List list){ - if(CollUtil.isNotEmpty(list)){ + public void checkNull(int size){ + if(size > 0){ throw new BizException("该证书编号重复"); } }