From 6df7368f0faf5d27204cf29641672b23c1f920f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 九月 2024 13:05:01 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a7ccd11..e352822 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -337,12 +337,14 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
         }
         if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+                .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                 .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                 .eq(Member::getIsdeleted,Constants.ZERO)) >0){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
         }
         if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                 .eq(Member::getPhone,  member.getPhone())
+                .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                 .eq(Member::getIsdeleted,Constants.ZERO) ) >0){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
         }
@@ -392,6 +394,7 @@
             }
             if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                     .eq(Member::getPhone,member.getPhone())
+                    .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                     .eq(Member::getIsdeleted,Constants.ZERO)
                     .ne(Member::getId,member.getId())) >0){
                 throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
@@ -406,6 +409,7 @@
             if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
                 if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                         .eq(Member::getIdcardNo,encrptNo)
+                        .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                         .eq(Member::getIsdeleted,Constants.ZERO)
                         .ne(Member::getId,member.getId())) >0){
                     throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");

--
Gitblit v1.9.3