luodangjia
2024-07-29 dc9239d73b15b9a51c46a9e8d25c0d4400e613ce
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
@@ -40,17 +40,17 @@
    @GetMapping("/addressTree")
    @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
    public R<List<Region>> addressTree() {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效!");
        }
        List<String> cityCodeList;
        if (loginUser.getIsFranchisee()) {
            cityCodeList = loginUser.getCityList();
        } else {
            cityCodeList = new ArrayList<>();
        }
        return R.ok(regionService.addressTree(cityCodeList));
//        LoginUser loginUser = tokenService.getLoginUser();
//        if (null == loginUser) {
//            return R.loginExpire("登录失效!");
//        }
//        List<String> cityCodeList;
//        if (loginUser.getIsFranchisee()) {
//            cityCodeList = loginUser.getCityList();
//        } else {
//            cityCodeList = new ArrayList<>();
//        }
        return R.ok(regionService.addressTree(null));
    }
}