From 09a49f7cd53acba5261802daf491cf01a10f8d9b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 五月 2025 09:40:06 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 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..c18629e 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()) @@ -2198,7 +2197,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