From 9304985adfaa4c80cd6a734f64dd5a42520534a5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 十月 2025 18:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 f7a7f27..4925570 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
@@ -1303,8 +1303,9 @@
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
if (roleType == 3) {
+ TCrmSalesperson one = crmSalespersonService.getOne(new LambdaQueryWrapper<TCrmSalesperson>().eq(TCrmSalesperson::getUserId, user.getUserId()));
LambdaQueryWrapper<TCrmClinic> eq = Wrappers.lambdaQuery(TCrmClinic.class);
- eq.eq(TCrmClinic::getSalespersonId, user.getUserId());
+ eq.eq(TCrmClinic::getSalespersonId, one.getId());
eq.in(TCrmClinic::getStatus, Arrays.asList(3, 4, 5));
List<TCrmClinic> list = crmClinicService.list(eq);
@@ -1384,8 +1385,9 @@
SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
Integer roleType = user.getRoleType();
if (roleType == 3) {
+ TCrmSalesperson one = crmSalespersonService.getOne(new LambdaQueryWrapper<TCrmSalesperson>().eq(TCrmSalesperson::getUserId, user.getUserId()));
LambdaQueryWrapper<TCrmClinic> eq = Wrappers.lambdaQuery(TCrmClinic.class);
- eq.eq(TCrmClinic::getSalespersonId, user.getUserId());
+ eq.eq(TCrmClinic::getSalespersonId,one.getId());
eq.in(TCrmClinic::getStatus, Arrays.asList(3, 4, 5));
List<TCrmClinic> list = crmClinicService.list(eq);
--
Gitblit v1.7.1