From 93e281b3cc60c8d24a0ed5547d3d399c03f9bab6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jun 2022 18:03:52 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
index 6507b54..179b0e4 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
@@ -13,12 +13,15 @@
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateMenuDto;
import com.xcong.farmer.cms.modules.system.entity.MenuEntity;
import com.xcong.farmer.cms.modules.system.entity.RoleMenuEntity;
+import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.entity.UserRoleEntity;
import com.xcong.farmer.cms.modules.system.mapper.MenuMapper;
import com.xcong.farmer.cms.modules.system.mapper.RoleMenuMapper;
import com.xcong.farmer.cms.modules.system.service.IMenuService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminMenuVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeMenuInfoVo;
+import com.xcong.farmer.cms.modules.system.vo.AdminUserMenuVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -41,8 +44,10 @@
@Override
public Result getMenuInPage(AdminMenuDto adminMenuDto) {
Page<AdminMenuVo> page = new Page<>(adminMenuDto.getPageNum(), adminMenuDto.getPageSize());
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
MenuEntity menuEntity = new MenuEntity();
menuEntity.setParentId(MenuEntity.PARENTID_DEFAULT);
+// menuEntity.setBelongId(userlogin.getBelongId()==null?UserEntity.USER_BELONG_TOP:userlogin.getBelongId());
IPage<AdminMenuVo> list = this.baseMapper.selectAdminMenuVoInPage(page,menuEntity);
List<AdminMenuVo> records = list.getRecords();
if(CollUtil.isNotEmpty(records)){
@@ -73,6 +78,7 @@
@Override
@Transactional
public Result addMenu(AdminAddMenuDto adminAddMenuDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
String menuName = adminAddMenuDto.getMenuName();
if(StrUtil.isEmpty(menuName)){
return Result.fail("请输入菜单名称");
@@ -194,12 +200,14 @@
@Override
public Result getMenuInList() {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
List<AdminMenuVo> records = this.baseMapper.selectAdminMenuVoInListByParentId(MenuEntity.PARENTID_DEFAULT);
if(CollUtil.isNotEmpty(records)){
for(AdminMenuVo adminMenuVo : records){
Long id = adminMenuVo.getId();
QueryWrapper<MenuEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
+// objectQueryWrapper.eq("belong_id",belongId);
List<MenuEntity> menuEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminMenuVo> adminMenuVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(menuEntities)){
@@ -217,6 +225,21 @@
adminMenuVo.setChild(adminMenuVoChilds);
}
}
+
+ if(CollUtil.isNotEmpty(records)){
+ for(AdminMenuVo adminMenuVo : records){
+ List<AdminMenuVo> child = adminMenuVo.getChild();
+ if(CollUtil.isNotEmpty(child)){
+ List<Long> menuIds = new ArrayList<>();
+ for(AdminMenuVo adminMenuVoChild : child){
+ Long id = adminMenuVoChild.getId();
+ menuIds.add(id);
+ }
+ List<AdminMenuVo> adminMenuVoByOrderNum = this.baseMapper.selectAdminMenuVoOrderByOrderNum(menuIds);
+ adminMenuVo.setChild(adminMenuVoByOrderNum);
+ }
+ }
+ }
return Result.ok(records);
}
}
--
Gitblit v1.9.1