From 1f9c7341b550a2e42c94a3bdd1489357c8e154d9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 01 一月 2025 17:36:57 +0800
Subject: [PATCH] 管理后台
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 4 ++--
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js | 6 ++++--
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 3508ea4..e097cd4 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -397,7 +397,7 @@
// 判断车牌号是否存在
if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
- return ResultUtil.runErr("车牌号已存在");
+ return ResultUtil.error("车牌号已存在");
}
if (1 == roleType){ //平台
@@ -504,7 +504,7 @@
// 判断车牌号是否存在
if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
.ne("id", tCar.getId())) > 0){
- return ResultUtil.runErr("车牌号已存在");
+ return ResultUtil.error("车牌号已存在");
}
if (1 == roleType){ //平台
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 39382ea..15c7e5d 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -879,7 +879,7 @@
tDriver.setUpdateTime(new Date());
tDriver.setUpdateUser(ShiroKit.getUser().getId());
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
- tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
+// tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
tDriverService.updateById(tDriver);
//删除业务
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
index 46f1518..3b022c9 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
@@ -269,10 +269,11 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCar/add", function(data){
+ console.log(data)
if(data.code == 200){
Feng.success("添加成功!");
}else {
- Feng.error("添加失败!" + data.message + "!");
+ Feng.error("添加失败!" + data.msg + "!");
}
window.parent.TCar.table.refresh();
TCarInfoDlg.close();
@@ -346,10 +347,11 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){
+ console.log(data)
if(data.code == 200){
Feng.success("添加成功!");
}else {
- Feng.error("添加失败!" + data.message + "!");
+ Feng.error("添加失败!" + data.msg + "!");
}
window.parent.TCar.table.refresh();
TCarInfoDlg.close();
--
Gitblit v1.7.1