From 93b4837bc4b26f81cfa2e59d9eb8e852225ce832 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 24 十二月 2025 11:48:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index b109079..26a0a34 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/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);
--
Gitblit v1.7.1