From ccfc11f040691d7359a773ec0f1e4165fffc7783 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 十二月 2024 10:40:17 +0800
Subject: [PATCH] 题目导入：题干重复会更新题目信息、答案去掉字符串空格；在线学习文件非必穿
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index d155005..63a9b14 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -138,16 +138,18 @@
}
Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
- for (Integer s : model.getDeptIds()) {
- UserDepartment userDepartment = new UserDepartment();
- userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(s);
- if (Objects.nonNull(oldDeptUser.get(s))) {
- userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
- } else {
- userDepartment.setDeptAdmin("0");
+ if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
+ for (Integer s : model.getDeptIds()) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
+ userDepartmentMapper.insert(userDepartment);
}
- userDepartmentMapper.insert(userDepartment);
}
tagService.removeUserTagByUserId(user.getId());
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
--
Gitblit v1.8.0