From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 744ad7e..72be050 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -49,6 +49,7 @@
}
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
+ data.put("id",loginUser.get("id"));
data.put("remind", remind);
return data;
}
@@ -103,7 +104,7 @@
User user = new User()
.setName(newPersonnelVo.getName())
.setAccount(newPersonnelVo.getAccount())
- .setAge(newPersonnelVo.getAge())
+ .setAge(String.valueOf(newPersonnelVo.getAge()))
.setPhone(newPersonnelVo.getPhone())
.setEmail(newPersonnelVo.getEmail())
.setRoleId(newPersonnelVo.getRole_id())
@@ -117,7 +118,7 @@
User user = new User()
.setName(updatePersonnelVo.getName())
.setAccount(updatePersonnelVo.getAccount())
- .setAge(updatePersonnelVo.getAge())
+ .setAge(String.valueOf(updatePersonnelVo.getAge()))
.setPhone(updatePersonnelVo.getPhone())
.setEmail(updatePersonnelVo.getEmail())
.setRoleId(updatePersonnelVo.getRole_id())
--
Gitblit v1.9.3