Merge remote-tracking branch 'origin/master'

xuhy

2025-10-16 9c302dc54f22e274eabc7ec3189aa1e217430944

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java

@@ -64,8 +64,6 @@
        if(!CollectionUtils.isEmpty(crmBranchAreas)){
            List<String> branchIds = crmBranchAreas.stream().map(TCrmBranchArea::getBranchId).collect(Collectors.toList());
            query.setBranchIds(branchIds);
        }else {
            return pageInfo;
        }
        List<TCrmBranchVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){