Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java

@@ -1,13 +1,13 @@
 package com.usky.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.SpringContextUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.SysRole;
-import com.usky.system.domain.SysRoleDept;
-import com.usky.system.domain.SysRoleMenu;
-import com.usky.system.domain.SysUserRole;
+import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysRoleDeptMapper;
 import com.usky.system.mapper.SysRoleMapper;
@@ -15,6 +15,7 @@ import com.usky.system.mapper.SysRoleMenuMapper;
 import com.usky.system.mapper.SysMobileRoleMenuMapper;
 import com.usky.system.mapper.SysUserRoleMapper;
 import com.usky.system.service.ISysRoleService;
+import com.usky.system.service.SysTenantMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +45,9 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
     @Autowired
     private SysRoleDeptMapper roleDeptMapper;
 
+    @Autowired
+    SysTenantMenuService SysTenantMenuService;
+
     /**
      * 根据条件分页查询角色数据
      * 
@@ -273,11 +277,23 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
         // 新增用户与角色管理
         List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
         if (null != role.getMenuIds() && role.getMenuIds().length > 0){
+            LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(SysTenantMenu::getTenantId,role.getTenantId())
+                    .in(SysTenantMenu::getMenuId,role.getMenuIds());
+            List<SysTenantMenu> list1 = SysTenantMenuService.list(queryWrapper);
+
             for (Long menuId : role.getMenuIds())
             {
                 SysRoleMenu rm = new SysRoleMenu();
                 rm.setRoleId(role.getRoleId());
                 rm.setMenuId(menuId);
+                if(CollectionUtils.isNotEmpty(list1)){
+                    for (int i = 0; i < list1.size(); i++) {
+                        if(menuId == list1.get(i).getMenuId()){
+                            rm.setMenuAliasName(list1.get(i).getMenuAliasName());
+                        }
+                    }
+                }
                 list.add(rm);
             }
         }