From fa7f58882321157516af32f6eaf98c2b1fb74c17 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 01 一月 2025 15:39:01 +0800
Subject: [PATCH] 管理后台
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 13 +++++++++++++
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 10 +++++++---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 2 +-
3 files changed, 21 insertions(+), 4 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 87cd0ce..3508ea4 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
@@ -394,6 +394,12 @@
@PostMapping(value = "/add")
@ResponseBody
public Object add(TCar tCar, String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
+
+ // 判断车牌号是否存在
+ if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
+ return ResultUtil.runErr("车牌号已存在");
+ }
+
if (1 == roleType){ //平台
tCar.setAudit(1);
if (2 == companyType.intValue()){
@@ -494,6 +500,13 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
+
+ // 判断车牌号是否存在
+ if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
+ .ne("id", tCar.getId())) > 0){
+ return ResultUtil.runErr("车牌号已存在");
+ }
+
if (1 == roleType){ //平台
tCar.setAudit(1);
if (2 == companyType.intValue()){
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 3b1ffaf..c5a7d92 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -126,7 +126,7 @@
<#input id="phone" name="*登录账号【手机号】" value="${item.phone}"/>
<#input id="password" name="*密码" type="password" />
- <#input id="rePassword" name="*确认密码" type="password" />
+ <#input id="rePassword" name="确认密码" type="password" />
<#input id="driverNationality" name="国籍" value="${item.driverNationality}"/>
<#input id="driverNation" name="民族" value="${item.driverNation}"/>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index 967e57a..b6cc9a7 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -73,9 +73,6 @@
},
rePassword: {
validators: {
- notEmpty: {
- message: '密码不能为空'
- },
regexp:{
regexp: /^.{6,18}$/,
message: '密码长度为6-18'
@@ -284,6 +281,13 @@
if(!this.validate()){
return ;
}
+
+ // 判断密码
+ if ($('#rePassword').val() == "" || $('#rePassword').val() == null){
+ Feng.info("密码不能为空");
+ return;
+ }
+
// 遍历this.tCarInfoData 如果有值为空字符串或者是undefined 将这个字段剔除
for (var key in this.yesDriverInfoData) {
if (this.yesDriverInfoData[key] == "" || this.yesDriverInfoData[key] == undefined) {
--
Gitblit v1.7.1