Merge remote-tracking branch 'origin/master'

jiangping

2023-12-05 766089ad50ae807ab88ba83b2dbc4a53bda8e423

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -74,7 +75,7 @@
        //获取出生日期
        String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
        //脱敏操作
        String hide = IdcardUtil.hide(member.getIdcardNo(), 6, 14);
        String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
        //转换日期
        DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");

@@ -138,6 +139,16 @@
    }

    @Override
    public void updateStatusById(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member update = new Member();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(member.getStatus());
        memberMapper.updateById(update);
    }

    @Override
    public void updateByIdInBatch(List<Member> members) {
        if (CollectionUtils.isEmpty(members)) {
            return;