From 928cccb960dc1c0e354e3569ecd8e964f6d24deb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 12 Apr 2021 17:41:25 +0800
Subject: [PATCH] 用户修改具体日志
---
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
index 230e3f4..15a3e70 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.UserGroupMapper;
@@ -14,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -30,10 +32,12 @@
private UserGroupMapper userGroupMapper;
@Override
+ @Transactional
public void allotGroups(Map<String, Object> parameters, String token) {
Integer userId = Integer.parseInt(parameters.get("userId").toString());
List<Integer> groupIds = (ArrayList) parameters.get("groupIds");
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
userGroupMapper.update(null, deleteWrapper);
@@ -42,9 +46,21 @@
UserGroup userGroup = new UserGroup();
userGroup.setUserId(userId);
userGroup.setGroupId(groupId);
- userGroup.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ userGroup.setOrganizationId((Integer) orgInfo.get("id"));
userGroupMapper.insert(userGroup);
}
}
}
+
+ @Override
+ public List<Integer> getGroupIds(Integer userId) {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id", userId).eq("is_delete", Constants.NOT_DELETE);
+ List<UserGroup> userGroups = userGroupMapper.selectList(queryWrapper);
+ List<Integer> groupIds = new ArrayList<>();
+ for (UserGroup userGroup : userGroups) {
+ groupIds.add(userGroup.getGroupId());
+ }
+ return groupIds;
+ }
}
--
Gitblit v1.8.0