Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-24 9e8ce689c89c4b03bfc67a60d7da13a7d593725a

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -182,6 +182,9 @@
    @ResponseBody
    public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
        User user = UserExt.getUser();
        ballQueryDto.setType(user.getObjectType());
        ballQueryDto.setId(user.getObjectId());
        return ballClient.list(ballQueryDto);
    }

@@ -374,7 +377,27 @@
    @RequestMapping("/pre_add")
    public String add(Model model) {

        Integer objectType = UserExt.getUser().getObjectType();

        if (objectType ==3){

            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_add1.html";

        }else {
            model.addAttribute("is3","false");
        }



        model.addAttribute("is","${is}");



        return PREFIX+"ball_pre_add.html";
    }
@@ -430,6 +453,18 @@
        model.addAttribute("ly",ly);


        Integer objectType = UserExt.getUser().getObjectType();

        if (objectType ==3){
            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_edit1.html";

        }

        return PREFIX+"ball_pre_edit.html";
    }