From 63351e58ad05ef72351feb3cc60758a9619a58b3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 10 Jan 2022 10:31:10 +0800
Subject: [PATCH] 1. 登录逻辑修改,新增登录记录 2. 登录记录查询导出新增

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 2fe0c1c..50485e6 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -56,6 +56,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -190,6 +191,15 @@
 	public R update(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
 		return R.status(userService.updateUser(user));
+	}
+
+	/**
+	 * 修改用户信息
+	 */
+	@PostMapping("/updateUser")
+	public R updateUser(@Valid @RequestBody User user) {
+		user.setUpdateTime(new Date());
+		return R.status(userService.updateById(user));
 	}
 
 	/**
@@ -372,5 +382,15 @@
 		return R.success("吊销成功");
 	}
 
+	/**
+	 * 查询押运人员
+	 *
+	 * @return
+	 */
+	@GetMapping("/selectPeo")
+	public R selectPeo(@ApiIgnore UserVO user) {
+		List list = userService.selectPeo(user);
+		return R.data(list);
+	}
 
 }

--
Gitblit v1.9.3