修改bug

Pu Zhibing

昨天 f3106694f7f9992391b26897571ff11462cfe475

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -160,6 +160,7 @@

     @RequestMapping("/taxi")
    public String taxi(String price, Model model) {
         model.addAttribute("json", new JSONObject());
         if(ToolUtil.isNotEmpty(price)){
             price = Base64.decodeStr(price);
             JSONObject json1 = JSONObject.fromObject(price);
@@ -305,10 +306,10 @@
        }
        if(null == one){
            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
                    .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
                    .eq("cityCode", systemPriceCity.getCityCode()).isNull("provinceCode").ne("flag", 3));
            if(null == one){
                one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
                        .ne("flag", 3));
                        .isNull("cityCode").isNull("provinceCode").ne("flag", 3));
                if(null != one){
                    return new ErrorTip(500, "不能重复添加城市");
                }
@@ -383,10 +384,10 @@
        }
        if(null == one){
            one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
                    .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
                    .eq("cityCode", systemPriceCity.getCityCode()).isNull("provinceCode").ne("flag", 3));
            if(null == one){
                one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
                        .ne("flag", 3));
                        .isNull("cityCode").isNull("provinceCode").ne("flag", 3));
                if(null != one && !systemPriceCity.getId().equals(one.getId())){
                    return new ErrorTip(500, "不能重复添加城市");
                }