From ffb2063003d3e735f3f8848207078b75c3f05bfa Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 21 May 2021 16:24:40 +0800
Subject: [PATCH] screen-manage 修改删除用户BUG
---
screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 98 -------------------------------------------------
1 files changed, 0 insertions(+), 98 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index 827af1c..4b93593 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -1,26 +1,11 @@
package com.moral.api.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
-import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
-import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
-import com.moral.api.pojo.dto.groupMenu.GroupMenuQueryDTO;
-import com.moral.api.pojo.form.groupMenu.GroupMenuQueryForm;
-import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.constant.Constants;
-import com.moral.constant.ResponseCodeEnum;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.List;
/**
* <p>
@@ -32,88 +17,5 @@
*/
@Service
public class GroupMenuServiceImpl extends ServiceImpl<GroupMenuMapper, GroupMenu> implements GroupMenuService {
-
- @Autowired
- GroupMenuMapper groupMenuMapper;
- @Autowired
- GroupMapper groupMapper;
-
- @Override
- @Transactional
- public GroupMenuDTO updateGroupMenu(GroupMenuUpdateForm form) {
- //������������������
- GroupMenuDTO dto = new GroupMenuDTO();
- //������
- Integer orgId = form.getOrganizationId();
- Integer channel = form.getChannel();
- List<Integer> insertMenuIds = form.getMenuIds();
- //������orgId������������admin������id
- Group group = queryAdminGroupByOrganizationId(orgId);
- if (ObjectUtils.isEmpty(group)) {//������������������������������������������������
- dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getMsg());
- return dto;
- }
- //���������������������������������
- UpdateWrapper deleteWrapper = new UpdateWrapper();
- deleteWrapper.set("is_delete", Constants.DELETE);
- deleteWrapper.eq("group_id", group.getId());
- groupMenuMapper.update(null, deleteWrapper);
- //������������
- for (Integer menuId : insertMenuIds) {
- GroupMenu groupMenu = new GroupMenu();
- groupMenu.setChannel(channel);
- groupMenu.setGroupId(group.getId());
- groupMenu.setMenuId(menuId);
- groupMenu.setOrganizationId(orgId);
- groupMenuMapper.insert(groupMenu);
- }
- //������������������
- dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
- dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- return dto;
- }
-
- @Override
- public GroupMenuQueryDTO queryGroupMenu(GroupMenuQueryForm form) {
- //������������������
- GroupMenuQueryDTO dto = new GroupMenuQueryDTO();
- //������
- Integer organizationId = form.getOrganizationId();
- //������������admin������
- Group group = queryAdminGroupByOrganizationId(organizationId);
- if (ObjectUtils.isEmpty(group)) {//������������������������������������������������
- dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getMsg());
- return dto;
- }
- //���������������������������������������
- QueryWrapper<GroupMenu> queryGroupMenuWrapper = new QueryWrapper<>();
- queryGroupMenuWrapper.eq("group_id", group.getId());
- queryGroupMenuWrapper.eq("is_delete",Constants.NOT_DELETE);
- List<GroupMenu> groupMenus = groupMenuMapper.selectList(queryGroupMenuWrapper);
- //������������������
- List<GroupMenuDTO> dtos = new ArrayList<>();
- for (GroupMenu groupMenu : groupMenus) {
- GroupMenuDTO groupMenuDTO = new GroupMenuDTO();
- groupMenuDTO.setGroupMenu(groupMenu);
- dtos.add(groupMenuDTO);
- }
- dto.setDtos(dtos);
- dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
- dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- return dto;
- }
-
- private Group queryAdminGroupByOrganizationId(Integer OrganizationId) {
- QueryWrapper<Group> queryGroupWrapper = new QueryWrapper<>();
- Group groupConditon = new Group();
- groupConditon.setOrganizationId(OrganizationId);
- groupConditon.setGroupName("admin");
- groupConditon.setIsDelete(Constants.NOT_DELETE);
- queryGroupWrapper.setEntity(groupConditon);
- return groupMapper.selectOne(queryGroupWrapper);
- }
-
}
--
Gitblit v1.8.0