From 9c1840e4302d8c4f7af549e5de412488073490bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:05 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 6 +++++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java | 26 +++++++++++++++++++++-----
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 10 ++++++++++
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
index 05710e4..9ee757f 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -535,10 +535,14 @@
List<User> list = userService.findByType2(type);
// 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
+ List<User> list1 = new ArrayList<User>();
entityManager.clear();
for (User u : list) {
u.setPassword(null);
+ if (u.getType()==0){
+ list1.add(u);
+ }
}
- return new ResultUtil<List<User>>().setData(list);
+ return new ResultUtil<List<User>>().setData(list1);
}
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
index c8c02d9..7268357 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
@@ -5,6 +5,7 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.Area;
+import cn.exrick.xboot.your.entity.Car;
import cn.exrick.xboot.your.service.IAreaService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -60,6 +61,15 @@
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Area> saveOrUpdate(Area area) {
+ QueryWrapper<Area> wrapper = new QueryWrapper<>();
+ if (!area.getUserId().equals("0")){
+ wrapper.eq("user_id",area.getUserId());
+ Area area1 = iAreaService.getOne(wrapper);
+ if (area1 != null && !area.getId().equals(area1.getId())){
+ return new ResultUtil<Area>().setErrorMsg("璇ラ厤閫佸憳宸茶鍏朵粬鐗囧尯缁戝畾,璇峰厛瑙ｇ粦");
+ }
+ }
+
if (iAreaService.saveOrUpdate(area)) {
return new ResultUtil<Area>().setData(area);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
index 55394c3..f7196eb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -5,10 +5,7 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.*;
-import cn.exrick.xboot.your.service.IAddOilService;
-import cn.exrick.xboot.your.service.ICarService;
-import cn.exrick.xboot.your.service.IDrivingRecordService;
-import cn.exrick.xboot.your.service.IOrderTaskService;
+import cn.exrick.xboot.your.service.*;
import cn.exrick.xboot.your.vo.CarVo;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -45,7 +42,7 @@
@Autowired
private IDrivingRecordService iDrivingRecordService;
@Autowired
- private IOrderTaskService iOrderTaskService;
+ private ICustomerService iCustomerService;
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -152,9 +149,28 @@
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Car> saveOrUpdate(Car car) {
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+ QueryWrapper<Car> wrapper1 = new QueryWrapper<>();
+ if (!car.getUserId().equals("")){
+ wrapper.eq("user_id",car.getUserId());
+ Car car1 = iCarService.getOne(wrapper);
+ if (car1!=null && !car1.getId().equals(car.getId())){
+ return new ResultUtil<Car>().setErrorMsg("璇ラ┚椹跺憳宸茶鍏朵粬杞﹁締缁戝畾,璇峰厛瑙ｇ粦");
+ }
+ }
+
+ if (!car.getFollowUserId().equals("")){
+ wrapper1.eq("follow_user_id",car.getFollowUserId());
+ Car car1 = iCarService.getOne(wrapper1);
+ if (car1!=null && !car1.getId().equals(car.getId())){
+ return new ResultUtil<Car>().setErrorMsg("璇ラ厤閫佸憳宸茶鍏朵粬杞﹁締缁戝畾,璇峰厛瑙ｇ粦");
+ }
+ }
+
if (iCarService.saveOrUpdate(car)) {
return new ResultUtil<Car>().setData(car);
}
+
return new ResultUtil<Car>().setErrorMsg("鎿嶄綔澶辫触");
}
--
Gitblit v1.9.1