Merge remote-tracking branch 'origin/master'

jiangping

2023-12-22 9e0dfce91096989056aaa9bb02e946d6e06465a5

Merge remote-tracking branch 'origin/master'

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

@@ -739,7 +739,7 @@
                .lambda().eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.memberType.internal)
                .isNotNull(Member::getHkId)
                .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = a.HK_ID AND TO_DAYS( NOW())- TO_DAYS( b.CREATE_DATE )> "+systemDictData.getCode()+") ")
                .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no =  HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+"  ")
        );
        if(CollectionUtils.isEmpty(memberList)){
           return;