From f2767f4dfa4a17c0a89e584047db4e3d7d91666d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 15:21:33 +0800
Subject: [PATCH] 派遣记录,单位修改

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 ca4679f..eea5dfe 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -422,7 +422,7 @@
 		userExcel.setRegistered("江西南昌");
 		userExcel.setRtime("2021-05-01");
 		userExcel.setHold("是");
-		userExcel.setSex("赣洪202100001");
+		userExcel.setSecuritynumber("赣洪202100001");
 		list.add(userExcel);
 		UserExcel userExcel1 = new UserExcel();
 		userExcel1.setDeptId("xxx保安公司");
@@ -439,7 +439,7 @@
 		userExcel1.setRegistered("江西南昌");
 		userExcel1.setRtime("2021-05-01");
 		userExcel1.setHold("否");
-		userExcel1.setSex("");
+		userExcel1.setSecuritynumber("");
 		list.add(userExcel1);
 		ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
 	}
@@ -640,5 +640,16 @@
 	}
 
 
+	/**
+	 * 保安员信息
+	 * @param user
+	 * @return
+	 */
+	@GetMapping("/getUserDetails")
+	public R getUserDetails(User user) {
+		return R.data(userService.getUserDetails(user));
+	}
+
+
 
 }

--
Gitblit v1.9.3