From 199971c2c2f20e22fdfb088b11caeaee1e523c2f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 13 Apr 2021 14:26:11 +0800
Subject: [PATCH] 添加角色新增日志
---
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index 5375285..a96953c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -4,9 +4,9 @@
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.GroupMenu;
-import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -31,23 +32,38 @@
private GroupMenuMapper groupMenuMapper;
@Override
+ @Transactional
public void allotMenus(Map<String, Object> parameters, String token) {
Integer groupId = Integer.parseInt(parameters.get("groupId").toString());
List<Integer> menuIds = (ArrayList) parameters.get("menuIds");
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
UpdateWrapper<GroupMenu> deleteWrapper = new UpdateWrapper<>();
deleteWrapper.set("is_delete", Constants.DELETE)
.eq("group_id", groupId)
.eq("channel", Constants.WEB_CHANNEL);
groupMenuMapper.update(null, deleteWrapper);
- if (!menuIds.isEmpty()) {
+ if (menuIds != null && !menuIds.isEmpty()) {
for (Integer menuId : menuIds) {
GroupMenu groupMenu = new GroupMenu();
groupMenu.setGroupId(groupId);
groupMenu.setMenuId(menuId);
groupMenu.setChannel(Constants.WEB_CHANNEL);
- groupMenu.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ groupMenu.setOrganizationId((Integer) orgInfo.get("id"));
+ groupMenuMapper.insert(groupMenu);
}
}
}
+
+ @Override
+ public List<Integer> getMenusIds(Integer groupId) {
+ QueryWrapper<GroupMenu> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("group_id", groupId).eq("is_delete", Constants.NOT_DELETE);
+ List<GroupMenu> groupMenus = groupMenuMapper.selectList(queryWrapper);
+ List<Integer> menuIds = new ArrayList<>();
+ for (GroupMenu groupMenu : groupMenus) {
+ menuIds.add(groupMenu.getMenuId());
+ }
+ return menuIds;
+ }
}
--
Gitblit v1.8.0