From 5da6ed09ce5a7a2f43328a6e3dedcf38b01fd48b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 一月 2025 18:03:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 7087c00..74e08f9 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
@@ -101,13 +101,13 @@
*/
@RequestMapping("/tCar_add")
public String tCarAdd(Model model) {
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).ne("flag",3));
model.addAttribute("companyList",companyList);
Integer roleType = ShiroKit.getUser().getRoleType();
model.addAttribute("roleType",roleType);
if (2 == roleType){
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().ne("flag",3).eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
model.addAttribute("franchiseeList",franchiseeList);
}else{
model.addAttribute("franchiseeList",null);
@@ -158,17 +158,18 @@
model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
if (1 == roleType){
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
+ .ne("flag",3));
model.addAttribute("companyList",companyList);
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tCar.getCompanyId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).ne("flag",3).eq("superiorId",tCar.getCompanyId()));
model.addAttribute("franchiseeList",franchiseeList);
}else if (2 == roleType){
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).ne("flag",3).eq("superiorId",ShiroKit.getUser().getObjectId()));
model.addAttribute("franchiseeList",franchiseeList);
}
//查询平台ID
- TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).ne("flag",3));
//判断是平台司机还是加盟司机
if ((SinataUtil.isEmpty(tCar.getCompanyId()) || tCar.getCompanyId() == 0 || tCar.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tCar.getFranchiseeId()) || tCar.getFranchiseeId() == 0)){
model.addAttribute("companyType",1);
@@ -396,7 +397,7 @@
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){
+ if (tCarService.selectCount(new EntityWrapper<TCar>().eq("state", 1).eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
return ResultUtil.error("车牌号已存在");
}
@@ -500,10 +501,11 @@
@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) {
-
+ int i1 = tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
+ .ne("id", tCar.getId())
+ .eq("state", 1));
// 判断车牌号是否存在
- if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
- .ne("id", tCar.getId())) > 0){
+ if ( i1> 0){
return ResultUtil.error("车牌号已存在");
}
--
Gitblit v1.7.1