From dfd4959471c057749b4db755ea141fca76e73357 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 02 十二月 2021 15:44:23 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 0cdd96a..64e9320 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -67,23 +67,29 @@
return new ResultUtil<OrderTask>().setData(orderTask);
}
- @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
- @ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
- public Result<Object> getAll() {
+ public Area getArea(String userId){
QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
+ wrapper.eq("user_id",userId);
Area area = iAreaService.getOne(wrapper);
if(area==null){
QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
- carQueryWrapper.eq("user_id",securityUtil.getCurrUser().getId());
+ carQueryWrapper.eq("user_id",userId);
Car one = iCarService.getOne(carQueryWrapper);
QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
wrapper3.eq("user_id",one.getFollowUserId());
area = iAreaService.getOne(wrapper);
- if(area==null){
- return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
- }
+ return area;
+ }
+ return area;
+ }
+
+ @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
+ public Result<Object> getAll() {
+ Area area = getArea(securityUtil.getCurrUser().getId());
+ if(area==null){
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
@@ -110,9 +116,7 @@
@RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟璇︽儏")
public Result<List<OrderTask>> getTodayOrder() {
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
@@ -136,9 +140,7 @@
return ResultUtil.error("姝ゅ晢鎴峰凡閰嶉��");
}
}else{
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
@@ -169,9 +171,7 @@
@ApiOperation(value = "鑾峰彇鍏跺畠淇℃伅")
public Result<Object> getTodayOtherInfo() {
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
--
Gitblit v1.9.1