From 1936cef71ca4ef95d52c951b4af5948c7885b893 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 19 二月 2024 15:17:26 +0800
Subject: [PATCH] 考试申报
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index b371060..7351376 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -4,6 +4,9 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
+
+import com.ruoyi.system.domain.SysUserInstitution;
+import com.ruoyi.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,11 +25,6 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
@@ -60,6 +58,9 @@
@Autowired
protected Validator validator;
+
+ @Autowired
+ private SysUserInstitutionMapper institutionMapper;
/**
* 根据条件分页查询用户列表
@@ -259,11 +260,14 @@
// 新增用户信息
int rows = userMapper.insertUser(user);
// 新增用户岗位关联
- insertUserPost(user);
+ //insertUserPost(user);
// 新增用户与角色管理
insertUserRole(user);
+ //用户关联机构
+ insertUserInstitution(user.getUserId(), user.getInstitutionIds());
return rows;
}
+
/**
* 注册用户信息
@@ -293,9 +297,12 @@
// 新增用户与角色管理
insertUserRole(user);
// 删除用户与岗位关联
- userPostMapper.deleteUserPostByUserId(userId);
+ /* userPostMapper.deleteUserPostByUserId(userId);
// 新增用户与岗位管理
- insertUserPost(user);
+ insertUserPost(user);*/
+ //删除机构
+ institutionMapper.deleteUserInstitutionByUserId(userId);
+ insertUserInstitution(user.getUserId(), user.getInstitutionIds());
return userMapper.updateUser(user);
}
@@ -432,6 +439,29 @@
}
/**
+ * 新增用户机构信息
+ *
+ * @param userId 用户ID
+ * @param institutionIds 机构组
+ */
+ public void insertUserInstitution(Long userId, Long[] institutionIds)
+ {
+ if (StringUtils.isNotEmpty(institutionIds))
+ {
+ // 新增用户与角色管理
+ List<SysUserInstitution> list = new ArrayList<SysUserInstitution>(institutionIds.length);
+ for (Long institutionId : institutionIds)
+ {
+ SysUserInstitution ui = new SysUserInstitution();
+ ui.setUserId(userId);
+ ui.setInstitutionId(institutionId);
+ list.add(ui);
+ }
+ institutionMapper.batchUserInstitution(list);
+ }
+ }
+
+ /**
* 通过用户ID删除用户
*
* @param userId 用户ID
@@ -466,7 +496,9 @@
// 删除用户与角色关联
userRoleMapper.deleteUserRole(userIds);
// 删除用户与岗位关联
- userPostMapper.deleteUserPost(userIds);
+ //userPostMapper.deleteUserPost(userIds);
+ //删除机构
+ institutionMapper.deleteUserInstitution(userIds);
return userMapper.deleteUserByIds(userIds);
}
--
Gitblit v1.9.2