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

44323

2023-10-25 cf6b7d7ebd13d2b6fe131112b92f5c607bebd868

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

@@ -406,8 +406,12 @@
            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";
        }


@@ -480,6 +484,10 @@
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_edit1.html";

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

        }

@@ -872,6 +880,10 @@
    @RequestMapping("/yuyuelist")
    @ResponseBody
    public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            bookingQuery.setStoreId(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> orders =   ballClient.listorder(bookingQuery);
        System.out.println("=======ballQueryDto=========="+bookingQuery);