Merge remote-tracking branch 'origin/master'

jiangping

2025-05-07 cf8b7e27e274f7def6339f7a6f2a4d592f7291ca

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

@@ -1943,6 +1943,7 @@
                    List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getIsdeleted,Constants.ZERO)
                                    .eq(Retention::getType,Constants.FOUR)
                                    .in(Retention::getCompanyId,lwCompanyIds)
                    );
@@ -1962,6 +1963,7 @@
                    List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getIsdeleted,Constants.ZERO)
                                    .eq(Retention::getType,Constants.TWO)
                                    .in(Retention::getCompanyId,internalCompanyIds)
                    );