From dd2554435b9ced61e2a6a06627145fca3bf2685b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 04 九月 2023 17:17:17 +0800
Subject: [PATCH] 修改bug
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 72e2822..47b0741 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
@@ -12,6 +12,7 @@
import com.yuanchu.limslaboratory.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.JsonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
@@ -58,12 +59,12 @@
}
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
+ data.put("account", loginUser.get("account"));
data.put("id",loginUser.get("id"));
+ data.put("roleId",loginUser.get("roleId"));
data.put("remind", remind);
+ data.put("sessionLayerId",loginUser.get("sessionLayerId"));
RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
- System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");
- System.out.println(role);
- System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
data.put("role",role);
return data;
}
@@ -94,10 +95,16 @@
}
@Override
- public List<Map<String, Object>> getUserNameAndId() {
+ public List<Map<String, Object>>
+ getUserNameAndId() {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
+ wrapper.select(User::getId, User::getName).eq(User::getType,1);
return userMapper.selectMaps(wrapper);
+ }
+
+ @Override
+ public RoleAndMenuDto getUserRoleInfo(String token) {
+ return null;
}
@Override
@@ -115,39 +122,35 @@
@Override
public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
+ User unmarshal = JsonUtil.jsonToPojo(JsonUtil.jsonToString(newPersonnelVo), User.class);
+ unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
+ return userMapper.insert(unmarshal);
+ }
+
+ @Override
+ public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
try {
- User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);
- unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
- return userMapper.insert(unmarshal);
+ MyUtil.PrintLog(updatePersonnelVo.toString());
+ User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
+
+ LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+ return userMapper.update(unmarshal, updateWrapper);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Override
- public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
- User user = new User()
- .setName(updatePersonnelVo.getName())
- .setAccount(updatePersonnelVo.getAccount())
- .setAge(String.valueOf(updatePersonnelVo.getAge()))
- .setPhone(updatePersonnelVo.getPhone())
- .setEmail(updatePersonnelVo.getEmail())
- .setRoleId(updatePersonnelVo.getRole_id())
- .setPassword(updatePersonnelVo.getPassword())
- .setJobState(updatePersonnelVo.getJobState());
- LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(User::getId, updatePersonnelVo.getId());
- return userMapper.update(user, updateWrapper);
- }
-
- @Override
public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
- MyUtil.PrintLog(name + status + "=============");
return userMapper.getNewPersonnelPage(name, page, status);
}
public RoleAndMenuDto getRoleInfo(Long roleId) {
+ if(roleId==0){
+ return null;
+ }
RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()
.stream()
--
Gitblit v1.9.3