From f3106694f7f9992391b26897571ff11462cfe475 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 18 九月 2025 10:27:03 +0800 Subject: [PATCH] 修改bug --- ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java index 53eebf1..4102954 100644 --- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java +++ b/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, "不能重复添加城市"); } -- Gitblit v1.7.1