From 1abab3ed63e5648b8d88c412dce70aad0736b98a Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:30 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
index ddcc1eb..a1ac1c8 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
@@ -15,6 +15,7 @@
import com.sinata.common.utils.poi.ExcelUtil;
import com.sinata.system.domain.MwApplication;
import com.sinata.system.domain.MwTransitCar;
+import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.SysUserDTO;
import com.sinata.system.domain.dto.SysUserStatusDTO;
import com.sinata.system.domain.query.SysUserQuery;
@@ -49,6 +50,7 @@
{
private final MwTransitCarService carService;
private final ISysUserService userService;
+ private final SysDepartmentService sysDepartmentService;
@ApiOperation(value = "获取绑定车辆",tags = "运输人员")
@PostMapping("/car")
public R<MwTransitCar> car() {
@@ -65,7 +67,8 @@
@ApiOperation(value = "获取车辆列表",tags = "运输人员")
@PostMapping("/list")
public R<List<MwTransitCar>> list() {
- List<MwTransitCar> list = carService.list();
+ SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
+ List<MwTransitCar> list = carService.lambdaQuery().eq(MwTransitCar::getDepartmentId,myDepartment.getId()).list();
return R.ok(list);
}
@@ -73,7 +76,6 @@
@PostMapping("/change")
public R<List<MwTransitCar>> change(@RequestParam Long carId) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-
SysUser byId = userService.getById(sysUser.getUserId());
byId.setCarId(carId);
userService.updateById(byId);
@@ -93,6 +95,17 @@
}
+ @ApiOperation(value = "取消绑定",tags = "运输人员")
+ @PostMapping("/cancel")
+ public R<SysUser> cancel() {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ sysUser.setCarId(-1L);
+ userService.updateById(sysUser);
+ return R.ok();
+
+ }
+
+
--
Gitblit v1.7.1