8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java

@@ -59,8 +59,12 @@
            if (null == userDataCountRequest.getCityList() || userDataCountRequest.getCityList().isEmpty()) {
                userDataCountRequest.setCityList(loginUser.getCityList());
            } else {
                userDataCountRequest.getCityList().addAll(loginUser.getCityList());
//                userDataCountRequest.getCityList().addAll(loginUser.getCityList());
            }
            R<List<Integer>> listR = orderClient.queryIdsBycode(userDataCountRequest.getCityList());

            return R.ok(userService.userDataCount1(userDataCountRequest, listR.getData()));

        }
        return R.ok(userService.userDataCount(userDataCountRequest));
    }
@@ -82,8 +86,11 @@
            if (null == cityList || cityList.isEmpty()) {
                cityList = loginUser.getCityList();
            } else {
                cityList.addAll(loginUser.getCityList());
//                cityList.addAll(loginUser.getCityList());
            }
            R<List<Integer>> listR = orderClient.queryIdsBycode(cityList);

            return R.ok(userService.userTrends1(cityList,listR.getData()));
        }
        return R.ok(userService.userTrends(cityList));
    }
@@ -105,7 +112,7 @@
            if (null == orderCount.getCityList() || orderCount.getCityList().isEmpty()) {
                orderCount.setCityList(loginUser.getCityList());
            } else {
                orderCount.getCityList().addAll(loginUser.getCityList());
//                orderCount.getCityList().addAll(loginUser.getCityList());
            }
        }
        return orderClient.orderCountHome(orderCount);
@@ -128,7 +135,7 @@
            if (null == cityList || cityList.isEmpty()) {
                cityList = loginUser.getCityList();
            } else {
                cityList.addAll(loginUser.getCityList());
//                cityList.addAll(loginUser.getCityList());
            }
        }
        return R.ok(masterWorkerService.workerRanking(cityList));