bug修改

无关风月

昨天 7cab5bda99ca42188bc15b2dae7d1fa4d1833fd9

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

@@ -1,6 +1,8 @@
package com.ruoyi.admin.controller;

import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.request.UserDataCountRequest;
import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.vo.MasterWorkerRankVO;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;

/**
@@ -51,16 +54,34 @@
    @ApiOperation(value = "后台-用户数据统计", tags = {"后台-首页"})
    @PostMapping(value = "/userDataCount")
    public R<UserDataCountVO> userDataCount(@RequestBody UserDataCountRequest userDataCountRequest) {
        LoginUser loginUser = tokenService.getLoginUser();
            LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
        if (loginUser.getIsFranchisee()) {

        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null){
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds = byId.getSiteIds().split(",");
            if (loginUser.getIsFranchisee()&&siteIds.length==0){
                return R.ok();
            }
        }
        userDataCountRequest.setSiteIds(Arrays.asList(siteIds));


        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.queryIdsBycodeAndSite(userDataCountRequest.getCityList(),userDataCountRequest.getSiteIds());

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

        }
        return R.ok(userService.userDataCount(userDataCountRequest));
    }
@@ -78,16 +99,22 @@
        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()));
        }
        return R.ok(userService.userTrends(cityList));
    }

    @Resource
    private FranchiseeService franchiseeService;
    /**
     * 回收订单统计
     *
@@ -105,9 +132,20 @@
            if (null == orderCount.getCityList() || orderCount.getCityList().isEmpty()) {
                orderCount.setCityList(loginUser.getCityList());
            } else {
                orderCount.getCityList().addAll(loginUser.getCityList());
//                orderCount.getCityList().addAll(loginUser.getCityList());
            }
        }
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null) {
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds = byId.getSiteIds().split(",");
            orderCount.setSiteIds(siteIds);
            if (loginUser.getIsFranchisee() && siteIds.length == 0) {
                return R.ok(new OrderResultVO());
            }
        }
        orderCount.setSiteIds(siteIds);
        return orderClient.orderCountHome(orderCount);
    }

@@ -128,9 +166,13 @@
            if (null == cityList || cityList.isEmpty()) {
                cityList = loginUser.getCityList();
            } else {
                cityList.addAll(loginUser.getCityList());
//                cityList.addAll(loginUser.getCityList());
            }
        }
        List<MasterWorkerRankVO> masterWorkerRankVOS = masterWorkerService.workerRanking(cityList);
        if (masterWorkerRankVOS.size()>10){
            return R.ok(masterWorkerRankVOS.subList(0,10));
        }
        return R.ok(masterWorkerService.workerRanking(cityList));
    }