bug修改

xuhy

2025-12-09 4cb4eba2d43f732907e4ccd73c43fca919bb5d6d

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

@@ -81,6 +81,22 @@
            List<String> branchIds = crmBranchAreas.stream().map(TCrmBranchArea::getBranchId).collect(Collectors.toList());
            query.setBranchIds(branchIds);
        }

        if(query.getRoleType() == 2){
            // 查询分公司账号
            TCrmBranch crmBranch = this.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
                    .eq(TCrmBranch::getUserId, query.getUserId())
                    .eq(TCrmBranch::getStatus, 1)
                    .last("LIMIT 1"));
            List<TCrmBranch> crmBranches = this.list(Wrappers.lambdaQuery(TCrmBranch.class)
                    .eq(TCrmBranch::getProvinceBranchId, crmBranch.getId()));
            if(CollectionUtils.isEmpty(crmBranches)){
                return pageInfo;
            }
            List<String> branchIds = crmBranches.stream().map(TCrmBranch::getId).collect(Collectors.toList());
            query.setBranchIdList(branchIds);
        }

        List<TCrmBranchVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;