diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java index 277e819..ebd982d 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java @@ -84,8 +84,8 @@ public class CorpCertificateController { @ApiOperation("判断证书编号是否存在") @GetMapping("/isExistCertNo") - public SingleResponse isExistCertNo(@RequestParam(value = "certNo") String certNo) { - return SingleResponse.of(corpCertificateService.isExistCertNo(certNo)); + public SingleResponse isExistCertNo(@RequestParam(value = "certNo") String certNo, @RequestParam(value = "id", required = false) Long id) { + return SingleResponse.of(corpCertificateService.isExistCertNo(certNo, id)); } } diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java index c506d4c..9704105 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java @@ -96,8 +96,8 @@ public class UserCertificateController { @ApiOperation("判断证件编号是否已存在") @GetMapping("/isExistCertNo") - public SingleResponse isExistCertNo(@RequestParam(value = "certNo") String certNo) { - return SingleResponse.of(userCertificateService.isExistCertNo(certNo)); + public SingleResponse isExistCertNo(@RequestParam(value = "certNo") String certNo, @RequestParam(value = "id", required = false) Long id) { + return SingleResponse.of(userCertificateService.isExistCertNo(certNo, id)); } } diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java index ddb8a8a..552d02a 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java @@ -79,9 +79,11 @@ public class CorpCertificateQueryExe { /** * 判断证书编号是否存在 */ - public boolean checkCertNoExist(String certNo) { + public boolean checkCertNoExist(String certNo, Long id) { return corpCertificateRepository.count(new LambdaQueryWrapper() - .eq(CorpCertificateDO::getCertificateCode, certNo)) > 0; + .eq(CorpCertificateDO::getCertificateCode, certNo) + .ne(id != null, CorpCertificateDO::getId, id) + ) > 0; } diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java index 155e064..9f11d2b 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java @@ -132,9 +132,10 @@ public class UserCertificateQueryExe { /** * 查询证书编号是否存在 */ - public boolean checkCertNoExist(String certNo) { + public boolean checkCertNoExist(String certNo, Long id) { return userCertificateRepository.count(new LambdaQueryWrapper() .eq(UserCertificateDO::getCertificateCode, certNo) + .ne(id != null, UserCertificateDO::getId, id) ) > 0; } diff --git a/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java index 19ff24d..c778f73 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java @@ -71,8 +71,8 @@ public class CorpCertificateServiceImpl implements CorpCertificateServiceI { } @Override - public boolean isExistCertNo(String certNo) { - return corpCertificateQueryExe.checkCertNoExist(certNo); + public boolean isExistCertNo(String certNo, Long id) { + return corpCertificateQueryExe.checkCertNoExist(certNo, id); } } diff --git a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java index 699c04e..a4396f8 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java @@ -77,8 +77,8 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI { } @Override - public boolean isExistCertNo(String certNo) { - return userCertificateQueryExe.checkCertNoExist(certNo); + public boolean isExistCertNo(String certNo, Long id) { + return userCertificateQueryExe.checkCertNoExist(certNo, id); } } diff --git a/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java index bc3d7da..b56bfbd 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java @@ -37,6 +37,6 @@ public interface CorpCertificateServiceI { /** * 判断证书编号是否存在 */ - boolean isExistCertNo(String certNo); + boolean isExistCertNo(String certNo, Long id); } diff --git a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java index c3e48bd..241868b 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java @@ -43,6 +43,6 @@ public interface UserCertificateServiceI { /** * 查询证书编号是否存在 */ - boolean isExistCertNo(String certNo); + boolean isExistCertNo(String certNo, Long id); } diff --git a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml index 9306544..63c0f4b 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml @@ -33,7 +33,7 @@ AND ( (#{params.corpType} = 0 AND ci.type IN (0,1)) - OR (#{params.corpType} = 1 AND ci.type IN (3,4,5)) + OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6)) ) diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index bc1820c..ad6a2b5 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -183,7 +183,7 @@ AND ( (#{params.corpType} = 0 AND ci.type IN (0,1)) - OR (#{params.corpType} = 1 AND ci.type IN (3,4,5)) + OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6)) )