From 24e84dca4ffd61cc92338263c3825e0944542f2e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 06 Jun 2025 19:28:10 +0800
Subject: [PATCH] 删除用户机构
---
oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
index 2a8fe44..86fbd18 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
@@ -72,16 +72,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void create(User resources) {
- resources.setDeptId(resources.getDept().getId());
if (userMapper.findByUsername(resources.getUsername()) != null) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
- if (userMapper.findByEmail(resources.getEmail()) != null) {
- throw new EntityExistException(User.class, "email", resources.getEmail());
- }
- if (userMapper.findByPhone(resources.getPhone()) != null) {
- throw new EntityExistException(User.class, "phone", resources.getPhone());
- }
+// if (userMapper.findByEmail(resources.getEmail()) != null) {
+// throw new EntityExistException(User.class, "email", resources.getEmail());
+// }
+// if (userMapper.findByPhone(resources.getPhone()) != null) {
+// throw new EntityExistException(User.class, "phone", resources.getPhone());
+// }
save(resources);
// 保存用户岗位
userJobMapper.insertData(resources.getId(), resources.getJobs());
@@ -94,17 +93,17 @@
public void update(User resources) throws Exception {
User user = getById(resources.getId());
User user1 = userMapper.findByUsername(resources.getUsername());
- User user2 = userMapper.findByEmail(resources.getEmail());
- User user3 = userMapper.findByPhone(resources.getPhone());
+// User user2 = userMapper.findByEmail(resources.getEmail());
+// User user3 = userMapper.findByPhone(resources.getPhone());
if (user1 != null && !user.getId().equals(user1.getId())) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
- if (user2 != null && !user.getId().equals(user2.getId())) {
- throw new EntityExistException(User.class, "email", resources.getEmail());
- }
- if (user3 != null && !user.getId().equals(user3.getId())) {
- throw new EntityExistException(User.class, "phone", resources.getPhone());
- }
+// if (user2 != null && !user.getId().equals(user2.getId())) {
+// throw new EntityExistException(User.class, "email", resources.getEmail());
+// }
+// if (user3 != null && !user.getId().equals(user3.getId())) {
+// throw new EntityExistException(User.class, "phone", resources.getPhone());
+// }
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getId());
@@ -112,20 +111,14 @@
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
redisUtils.del(CacheKey.ROLE_USER + resources.getId());
}
- // 修改机构会影响 数据权限
- if (!Objects.equals(resources.getDept(),user.getDept())) {
- redisUtils.del(CacheKey.DATA_USER + resources.getId());
- }
// 如果用户被禁用，则清除用户登录信息
if(!resources.getEnabled()){
onlineUserService.kickOutForUsername(resources.getUsername());
}
- user.setDeptId(resources.getDept().getId());
user.setUsername(resources.getUsername());
user.setEmail(resources.getEmail());
user.setEnabled(resources.getEnabled());
user.setRoles(resources.getRoles());
- user.setDept(resources.getDept());
user.setJobs(resources.getJobs());
user.setPhone(resources.getPhone());
user.setNickName(resources.getNickName());
@@ -175,6 +168,11 @@
@Override
public User findByName(String userName) {
return userMapper.findByUsername(userName);
+ }
+
+ @Override
+ public User findByOpenid(String openid) {
+ return userMapper.findByOpenid(openid);
}
@Override
@@ -246,7 +244,6 @@
Map<String, Object> map = new LinkedHashMap<>();
map.put("用户名", user.getUsername());
map.put("角色", roles);
- map.put("机构", user.getDept().getName());
map.put("岗位", user.getJobs().stream().map(Job::getName).collect(Collectors.toList()));
map.put("邮箱", user.getEmail());
map.put("状态", user.getEnabled() ? "启用" : "禁用");
--
Gitblit v1.9.3