From 1529842471c8c07a5181a10404b6dff2a0944500 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 06 八月 2024 09:00:22 +0800
Subject: [PATCH] 8.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
index 0f8a7b5..86e88b6 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
@@ -55,12 +55,13 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- if (loginUser.getIsFranchisee()) {
+ if (loginUser.getIsFranchisee()||!userDataCountRequest.getCityList().isEmpty()) {
if (null == userDataCountRequest.getCityList() || userDataCountRequest.getCityList().isEmpty()) {
userDataCountRequest.setCityList(loginUser.getCityList());
- } else {
-// userDataCountRequest.getCityList().addAll(loginUser.getCityList());
}
+// else {
+//// userDataCountRequest.getCityList().addAll(loginUser.getCityList());
+// }
R<List<Integer>> listR = orderClient.queryIdsBycode(userDataCountRequest.getCityList());
return R.ok(userService.userDataCount1(userDataCountRequest, listR.getData()));
@@ -82,12 +83,13 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- if (loginUser.getIsFranchisee()) {
+ if (loginUser.getIsFranchisee()||!cityList.isEmpty()) {
if (null == cityList || cityList.isEmpty()) {
cityList = loginUser.getCityList();
- } else {
-// cityList.addAll(loginUser.getCityList());
}
+// else {
+//// cityList.addAll(loginUser.getCityList());
+// }
R<List<Integer>> listR = orderClient.queryIdsBycode(cityList);
return R.ok(userService.userTrends1(cityList,listR.getData()));
--
Gitblit v1.7.1