From b0f68c57f7699d083818b9837289e4fb5b7cb25c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 09:14:52 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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 cf85644..2cd7077 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
@@ -579,7 +579,6 @@
         trainTimeMapper.insert(trainTime);*/
         return insert.getId();
     }
-
     @Override
     @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
@@ -628,8 +627,6 @@
             }
         }
     }
-
-
     @Override
     public void roleAuthById(Integer id,LoginUserInfo user) {
         Member member = memberMapper.selectById(id);
@@ -698,7 +695,6 @@
                 memberRole.setStartTime(trainTime.getStartTime());
                 memberRole.setEndTime(trainTime.getEndTime());
             }
-
             memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                     .eq(Member::getId,member.getId())
                     .set(Member::getRoleId,member.getRoleId())
@@ -1495,6 +1491,9 @@
                         .like(Member::getPhone,pageWrap.getModel().getKeyword())
                         .or().like(Member::getName,pageWrap.getModel().getKeyword())
                         .or().like(Member::getCode,pageWrap.getModel().getKeyword()))
+                .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,
+                        DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())
+                )
                 .isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
                 .isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
                 .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
@@ -1952,7 +1951,6 @@
         }
     }
 
-
     @Override
     public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
         List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
@@ -2198,7 +2196,7 @@
         String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
         if(StringUtils.isNotBlank(model.getIdcardNo())){
             if(findMemberFromListByIdcard(candNo,memberList ) !=null){
-                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃纭銆愯瀹㈢鐞嗐�戙�愬唴閮ㄤ汉鍛樸�戜互鍙娿�愮浉鍏虫柟浜哄憳銆戜腑鏃犺韬唤璇佸瓨鍦紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
             }
         }
 

--
Gitblit v1.9.3