8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

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

@@ -40,6 +40,22 @@
    @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(null));
    }

    @GetMapping("/manageaddressTree")
    @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
    public R<List<Region>> manageaddressTree() {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
@@ -50,7 +66,9 @@
        } else {
            cityCodeList = new ArrayList<>();
        }
        return R.ok(regionService.addressTree(cityCodeList));
        return R.ok(regionService.addressTree1(cityCodeList));
    }



}