From 109d785b5b30dc28fd9a106f0dcbb7fd45526810 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 16:25:43 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 921d94a..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) {
@@ -609,18 +608,18 @@
                 .eq(Cars::getIsdeleted,Constants.ZERO)
                 .eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
         );
-        if ((carsMapper!=null && carsList.size()>0)){
+        if (carsList!=null && carsList.size()>0){
             for(Cars car :carsList){
-               if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
-                   Cars model = new Cars();
+               if(Constants.equalsInteger(car.getAuthStatus(),Constants.ONE)){
                    carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                            .eq(Cars::getId,car.getId())
                            .set(Cars::getStartTime,null)
+//                           .set(Cars::getMemberId,null)
                            .set(Cars::getEndTime,null)
                            .set(Cars::getAuthTimeType,null)
                            .set(Cars::getAuthStatus,Constants.ZERO)
-                           .set(Cars::getEditDate,model.getEditDate())
-                           .set(Cars::getEdirot,model.getEdirot())
+                           .set(Cars::getEditDate,member.getEditDate())
+                           .set(Cars::getEdirot,member.getEditor())
                    );
                    //鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
                    CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
@@ -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,11 +1491,15 @@
                         .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())
                 .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                 .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+                .eq(Objects.nonNull(pageWrap.getModel().getAuthStatus()),Member::getAuthStatus,pageWrap.getModel().getAuthStatus())
                 .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
                 .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                 .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
@@ -2197,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