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/GroupMenuServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 651b199..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,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.GroupMenu;
 import com.moral.api.mapper.GroupMenuMapper;
@@ -14,6 +15,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -30,24 +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