From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 17abe1c..a85f1dd 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -227,7 +227,7 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
tSystemPrice.setType(1);
@@ -247,7 +247,7 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
tSystemPrice.setType(4);
@@ -263,7 +263,7 @@
@ResponseBody
public Object update(TSystemPrice tSystemPrice) {
TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
- if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
//判断当前公司是否添加过该专车车型价格配置
int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
.eq("type", 1)
@@ -272,7 +272,7 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
}
tSystemPriceService.updateById(tSystemPrice);
@@ -283,7 +283,7 @@
@ResponseBody
public Object smallupdate(TSystemPrice tSystemPrice) {
TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
- if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
//判断当前公司是否添加过该专车车型价格配置
int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
.eq("isPackage", 1)
@@ -292,7 +292,7 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
}
tSystemPriceService.updateById(tSystemPrice);
--
Gitblit v1.7.1