Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-12-24 93b4837bc4b26f81cfa2e59d9eb8e852225ce832

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -660,10 +660,6 @@

                }
            }
            BranchAdminListVO branchAdminListVO = new BranchAdminListVO();
            branchAdminListVO.setId(branch.getId());
            branchAdminListVO.setName(branch.getBranchName());
            branchAdminListVOs.add(branchAdminListVO);
        }
        return R.ok(branchAdminListVOs);
    }
@@ -726,11 +722,6 @@

                }
            }
            BranchAdminListVO branchAdminListVO = new BranchAdminListVO();
            branchAdminListVO.setId(branch.getId());
            branchAdminListVO.setName(branch.getBranchName());
            branchAdminListVOs.add(branchAdminListVO);

        }

        ArrayList<BranchAdminListVO> list = new ArrayList<>();
@@ -922,8 +913,12 @@

                }
            }
            long count = crmSalespersonService.count(new LambdaQueryWrapper<TCrmSalesperson>().in(TCrmSalesperson::getBranchId, branchIdsAll));
            branchAdminStatisticsOneVo.setStaffCount((int) count);
            if(CollectionUtils.isEmpty(branchIdsAll)){
                branchAdminStatisticsOneVo.setStaffCount(0);
            }else{
                long count = crmSalespersonService.count(new LambdaQueryWrapper<TCrmSalesperson>().in(TCrmSalesperson::getBranchId, branchIdsAll));
                branchAdminStatisticsOneVo.setStaffCount((int) count);
            }
        }
        return R.ok(branchAdminStatisticsOneVo);