Merge remote-tracking branch 'origin/master'

jiangping

2024-12-13 1110e717afecf1cc78950a5f054bfa0c1b159ae1

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

@@ -82,7 +82,7 @@
    @Autowired
    private RetentionMapper retentionMapper;
    @Autowired
    private VisitsMapper visitsMapper;
    private VisitsJoinMapper visitsMapper;
    @Autowired
    private ApproveMapper approveMapper;
    @Autowired
@@ -1409,6 +1409,18 @@
                            memberId)
            );
//        }

        Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
                .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
                        .eq(Notices::getUserId,memberId)
                        .eq(Notices::getSendacopy,Constants.ZERO)
                .last(" limit 1 ")
        );
        if(Objects.nonNull(notices)){
            notices.setInfo(notices.getInfo());
        }else{
            notices.setInfo("暂无");
        }
        return visitDetailVO;
    }