From 172c5525cbdba1c3b32b47cb60bd35bed707101c Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 27 三月 2023 17:18:48 +0800
Subject: [PATCH] 增加功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
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 7268357..b1cbb90 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
@@ -43,7 +43,8 @@
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
public Result<List<Area>> getAll() {
-
+ QueryWrapper<Area> wrapper = new QueryWrapper<>();
+ wrapper.orderByAsc("name");
List<Area> list = iAreaService.list();
return new ResultUtil<List<Area>>().setData(list);
}
@@ -62,11 +63,11 @@
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Area> saveOrUpdate(Area area) {
QueryWrapper<Area> wrapper = new QueryWrapper<>();
- if (!area.getUserId().equals("0")){
- wrapper.eq("user_id",area.getUserId());
+ if (StrUtil.isNotEmpty(area.getCarId())){
+ wrapper.eq("car_id",area.getCarId());
Area area1 = iAreaService.getOne(wrapper);
if (area1 != null && !area.getId().equals(area1.getId())){
- return new ResultUtil<Area>().setErrorMsg("璇ラ厤閫佸憳宸茶鍏朵粬鐗囧尯缁戝畾,璇峰厛瑙ｇ粦");
+ return new ResultUtil<Area>().setErrorMsg("璇ヨ溅杈嗗凡琚叾瀹冪墖鍖虹粦瀹�,璇峰厛瑙ｇ粦");
}
}
--
Gitblit v1.9.1