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

44323

2023-10-24 ab17f44cc4aa2b15c36d6f523fa3844a338101ce

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

@@ -220,8 +220,24 @@
        game.setRed(red);
        game.setState(0);
        game.setBlue(blue);


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

        if (objectType ==3){


            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            System.out.println("=====byId======="+byId);
            game.setProvinceCode(byId.getProvinceCode());
            game.setCityCode(byId.getCityCode());


        }else {
        game.setProvinceCode(province);
        game.setCityCode(city);

        }
        game.setSiteId(site);
        game.setStoreId(store);
        game.setId(id);
@@ -384,13 +400,18 @@
            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            System.out.println("=====byId======="+byId);
            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");
        }

        if (objectType == 2){
            model.addAttribute("is3","true");
            model.addAttribute("oId",UserExt.getUser().getObjectId());
            return PREFIX+"ball_pre_add2.html";
        }


@@ -465,6 +486,10 @@
            return PREFIX+"ball_pre_edit1.html";

        }
        if (objectType == 2){
            return PREFIX+"ball_pre_edit2.html";

        }

        return PREFIX+"ball_pre_edit.html";
    }