重命名companymenu名字为TenantCompanyMenu

fs-admin/src/main/java/com/fs/tenant/TenantInfoController.java

@@ -7,13 +7,14 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysMenu;
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.enums.DataSourceType;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyMenu;
+
 import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.framework.datasource.TenantDataSourceManager;
 import com.fs.system.domain.SysConfig;
@@ -154,7 +155,7 @@ public class TenantInfoController extends BaseController
             return tenantInfoService.menuChange(flag, sysMenus,null);
         }
 
-        List<CompanyMenu> companyMenus = tenantInfoMapper.selectCompanyMenuList(new CompanyMenu());
+        List<TenantCompanyMenu> companyMenus = tenantInfoMapper.selectCompanyMenuList(new TenantCompanyMenu());
         tenantDataSourceManager.switchTenant(tenantInfo);
         return tenantInfoService.menuChange(flag,null,companyMenus);
 
@@ -180,7 +181,7 @@ public class TenantInfoController extends BaseController
             return tenantInfoService.menuEdit(selected, unSelected, menuDto.getFlag(),addSysMenu,null);
         }
 
-        List<CompanyMenu> addCompanyMenu = getAddCompanyMenu(tenantInfo, menuDto.getSelected());
+        List<TenantCompanyMenu> addCompanyMenu = getAddCompanyMenu(tenantInfo, menuDto.getSelected());
         tenantDataSourceManager.switchTenant(tenantInfo);
         return tenantInfoService.menuEdit(selected, unSelected, menuDto.getFlag(),null,addCompanyMenu);
     }
@@ -251,7 +252,7 @@ public class TenantInfoController extends BaseController
     /**
      * 获取需要更新的销售菜单
      */
-    private List<CompanyMenu> getAddCompanyMenu(TenantInfo tenantInfo,List<Long> selected){
+    private List<TenantCompanyMenu> getAddCompanyMenu(TenantInfo tenantInfo, List<Long> selected){
         // 切换到租户库
         tenantDataSourceManager.switchTenant(tenantInfo);
         // 查询租户库里已经存在的menuId
@@ -263,7 +264,7 @@ public class TenantInfoController extends BaseController
         // 去总库查询详细的菜单详情
         DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
         if (!CollectionUtils.isEmpty(needAddIds)) {
-            List<CompanyMenu> addMenuList = tenantInfoMapper.getTenComMenuByIds(needAddIds);
+            List<TenantCompanyMenu> addMenuList = tenantInfoMapper.getTenComMenuByIds(needAddIds);
             return addMenuList;
         }
 
@@ -286,9 +287,9 @@ public class TenantInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/tenantComMenu/list")
-    public AjaxResult list(CompanyMenu menu)
+    public AjaxResult list(TenantCompanyMenu menu)
     {
-        List<CompanyMenu> menus = tenantInfoService.selectCompanyMenuList(menu, getUserId());
+        List<TenantCompanyMenu> menus = tenantInfoService.selectCompanyMenuList(menu, getUserId());
         return AjaxResult.success(menus);
     }
 
@@ -337,7 +338,7 @@ public class TenantInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping("/addTenantComMenu")
-    public AjaxResult addTenantComMenu(@Validated @RequestBody CompanyMenu menu)
+    public AjaxResult addTenantComMenu(@Validated @RequestBody TenantCompanyMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(tenantInfoService.checkComMenuNameUnique(menu)))
         {
@@ -381,7 +382,7 @@ public class TenantInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenantComMenu")
-    public AjaxResult updateTenantComMenu(@Validated @RequestBody CompanyMenu menu)
+    public AjaxResult updateTenantComMenu(@Validated @RequestBody TenantCompanyMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(tenantInfoService.checkComMenuNameUnique(menu)))
         {

fs-common/src/main/java/com/fs/common/core/domain/TreeSelect.java

@@ -6,7 +6,8 @@ import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fs.common.core.domain.entity.SysDept;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
+
 
 /**
  * Treeselect树结构实体类
@@ -54,7 +55,7 @@ public class TreeSelect implements Serializable
         this.status = menu.getStatus();
     }
 
-    public TreeSelect(CompanyMenu menu)
+    public TreeSelect(TenantCompanyMenu menu)
     {
         this.id = menu.getMenuId();
         this.label = menu.getMenuName();

fs-common/src/main/java/com/fs/common/core/domain/entity/CompanyMenu.java → fs-common/src/main/java/com/fs/common/core/domain/entity/TenantCompanyMenu.java

@@ -1,4 +1,4 @@
-package com.fs.company.domain;
+package com.fs.common.core.domain.entity;
 
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author fs
  * @date 2021-05-25
  */
-public class CompanyMenu extends BaseEntity
+public class TenantCompanyMenu extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -69,13 +69,23 @@ public class CompanyMenu extends BaseEntity
     @Excel(name = "菜单图标")
     private String icon;
 
-    private List<CompanyMenu> children = new ArrayList<CompanyMenu>();
+    private String companyId;
 
-    public List<CompanyMenu> getChildren() {
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    private List<TenantCompanyMenu> children = new ArrayList<TenantCompanyMenu>();
+
+    public List<TenantCompanyMenu> getChildren() {
         return children;
     }
 
-    public void setChildren(List<CompanyMenu> children) {
+    public void setChildren(List<TenantCompanyMenu> children) {
         this.children = children;
     }
 

fs-service/src/main/java/com/fs/system/service/ISysMenuService.java

@@ -4,7 +4,8 @@ import java.util.List;
 import java.util.Set;
 import com.fs.common.core.domain.TreeSelect;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.system.domain.vo.RouterVo;
 
 /**
@@ -78,7 +79,7 @@ public interface ISysMenuService
      * @return 下拉树结构列表
      */
     public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
-    public List<TreeSelect> buildComMenuTreeSelect(List<CompanyMenu> menus);
+    public List<TreeSelect> buildComMenuTreeSelect(List<TenantCompanyMenu> menus);
 
     /**
      * 根据菜单ID查询信息

fs-service/src/main/java/com/fs/system/service/impl/SysMenuServiceImpl.java

@@ -9,7 +9,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.fs.company.domain.CompanyMenu;
+
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.common.constant.Constants;
@@ -229,17 +230,17 @@ public class SysMenuServiceImpl implements ISysMenuService
         return returnList;
     }
 
-    public List<CompanyMenu> buildComMenuTree(List<CompanyMenu> menus)
+    public List<TenantCompanyMenu> buildComMenuTree(List<TenantCompanyMenu> menus)
     {
-        List<CompanyMenu> returnList = new ArrayList<CompanyMenu>();
+        List<TenantCompanyMenu> returnList = new ArrayList<TenantCompanyMenu>();
         List<Long> tempList = new ArrayList<Long>();
-        for (CompanyMenu dept : menus)
+        for (TenantCompanyMenu dept : menus)
         {
             tempList.add(dept.getMenuId());
         }
-        for (Iterator<CompanyMenu> iterator = menus.iterator(); iterator.hasNext();)
+        for (Iterator<TenantCompanyMenu> iterator = menus.iterator(); iterator.hasNext();)
         {
-            CompanyMenu menu = (CompanyMenu) iterator.next();
+            TenantCompanyMenu menu = (TenantCompanyMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(menu.getParentId()))
             {
@@ -271,8 +272,8 @@ public class SysMenuServiceImpl implements ISysMenuService
     }
 
     @Override
-    public List<TreeSelect> buildComMenuTreeSelect(List<CompanyMenu> menus) {
-        List<CompanyMenu> menuTrees = buildComMenuTree(menus);
+    public List<TreeSelect> buildComMenuTreeSelect(List<TenantCompanyMenu> menus) {
+        List<TenantCompanyMenu> menuTrees = buildComMenuTree(menus);
         return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
@@ -514,12 +515,12 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
     }
 
-    private void recursionFnCom(List<CompanyMenu> list, CompanyMenu t)
+    private void recursionFnCom(List<TenantCompanyMenu> list, TenantCompanyMenu t)
     {
         // 得到子节点列表
-        List<CompanyMenu> childList = getChildListCom(list, t);
+        List<TenantCompanyMenu> childList = getChildListCom(list, t);
         t.setChildren(childList);
-        for (CompanyMenu tChild : childList)
+        for (TenantCompanyMenu tChild : childList)
         {
             if (hasChildCom(list, tChild))
             {
@@ -548,13 +549,13 @@ public class SysMenuServiceImpl implements ISysMenuService
         return tlist;
     }
 
-    private List<CompanyMenu> getChildListCom(List<CompanyMenu> list, SysMenu t)
+    private List<TenantCompanyMenu> getChildListCom(List<TenantCompanyMenu> list, SysMenu t)
     {
-        List<CompanyMenu> tlist = new ArrayList<CompanyMenu>();
-        Iterator<CompanyMenu> it = list.iterator();
+        List<TenantCompanyMenu> tlist = new ArrayList<TenantCompanyMenu>();
+        Iterator<TenantCompanyMenu> it = list.iterator();
         while (it.hasNext())
         {
-            CompanyMenu n = (CompanyMenu) it.next();
+            TenantCompanyMenu n = (TenantCompanyMenu) it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue())
             {
                 if("0".equals(n.getStatus())){
@@ -565,13 +566,13 @@ public class SysMenuServiceImpl implements ISysMenuService
         return tlist;
     }
 
-    private List<CompanyMenu> getChildListCom(List<CompanyMenu> list, CompanyMenu t)
+    private List<TenantCompanyMenu> getChildListCom(List<TenantCompanyMenu> list, TenantCompanyMenu t)
     {
-        List<CompanyMenu> tlist = new ArrayList<CompanyMenu>();
-        Iterator<CompanyMenu> it = list.iterator();
+        List<TenantCompanyMenu> tlist = new ArrayList<TenantCompanyMenu>();
+        Iterator<TenantCompanyMenu> it = list.iterator();
         while (it.hasNext())
         {
-            CompanyMenu n = (CompanyMenu) it.next();
+            TenantCompanyMenu n = (TenantCompanyMenu) it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue())
             {
                 if("0".equals(n.getStatus())){
@@ -590,7 +591,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         return getChildList(list, t).size() > 0 ? true : false;
     }
 
-    private boolean hasChildCom(List<CompanyMenu> list, CompanyMenu t)
+    private boolean hasChildCom(List<TenantCompanyMenu> list, TenantCompanyMenu t)
     {
         return getChildListCom(list, t).size() > 0 ? true : false;
     }

fs-service/src/main/java/com/fs/tenant/mapper/TenantInfoMapper.java

@@ -2,7 +2,8 @@ package com.fs.tenant.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.tenant.domain.TenantInfo;
 import com.fs.tenant.vo.TenantInfoShowVo;
 import org.apache.ibatis.annotations.Param;
@@ -78,9 +79,9 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 
     List<SysMenu> selectMenuListByUserId(SysMenu menu);
 
-    public CompanyMenu selectCompanyMenuById(Long menuId);
+    public TenantCompanyMenu selectCompanyMenuById(Long menuId);
 
-    public List<CompanyMenu> selectCompanyMenuList(CompanyMenu companyMenu);
+    public List<TenantCompanyMenu> selectCompanyMenuList(TenantCompanyMenu companyMenu);
 
     SysMenu selectMenuById(Long menuId);
 
@@ -96,17 +97,17 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 
     int deleteMenuById(Long menuId);
 
-    CompanyMenu checkComMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+    TenantCompanyMenu checkComMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
 
-    int insertComMenu(CompanyMenu menu);
+    int insertComMenu(TenantCompanyMenu menu);
 
-    int updateComMenu(CompanyMenu menu);
+    int updateComMenu(TenantCompanyMenu menu);
 
     int hasChildByComMenuId(Long menuId);
 
     int deleteComMenuById(Long menuId);
 
-    List<CompanyMenu> selectTenantComMenu();
+    List<TenantCompanyMenu> selectTenantComMenu();
 
     int updatePitchComMenu(@Param("selected")List<Long> selected);
 
@@ -120,9 +121,9 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 
     List<Long> selectExistComMenuIds();
 
-    List<CompanyMenu> getTenComMenuByIds(List<Long> needAddIds);
+    List<TenantCompanyMenu> getTenComMenuByIds(List<Long> needAddIds);
 
-    int addComMenu(List<CompanyMenu> addCompanyMenu);
+    int addComMenu(List<TenantCompanyMenu> addCompanyMenu);
 
     TenantInfo getTenByCode(String code);
 }

fs-service/src/main/java/com/fs/tenant/service/TenantAsyncService.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.tenant.domain.TenantExecuteTask;
 import com.fs.tenant.domain.TenantInfo;
 import com.fs.tenant.domain.TenantSqlExecuteRecord;
@@ -33,7 +34,7 @@ public class TenantAsyncService {
     private ITenantSqlExecuteRecordService tenantSqlExecuteRecordService;
 
     @Async
-    public void asyncInit(TenantInfo tenantInfo, List<SysMenu> menus,List<CompanyMenu> companyMenus) {
+    public void asyncInit(TenantInfo tenantInfo, List<SysMenu> menus,List<TenantCompanyMenu> companyMenus) {
         try {
             TenantUtils.initTables(tenantInfo.getDbIp(), tenantInfo.getDbPort(),tenantInfo.getDbName(), tenantInfo.getDbAccount(), tenantInfo.getDbPwd());
             TenantUtils.initMenus(tenantInfo.getDbIp(), tenantInfo.getDbPort(),tenantInfo.getDbName(), tenantInfo.getDbAccount(), tenantInfo.getDbPwd(),menus);

fs-service/src/main/java/com/fs/tenant/service/TenantInfoService.java

@@ -3,7 +3,8 @@ package com.fs.tenant.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+;
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.tenant.domain.TenantInfo;
 import com.fs.tenant.vo.TenantInfoShowVo;
 
@@ -65,9 +66,9 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     List<TenantInfoShowVo> tenantList(TenantInfo tenantInfo);
 
-    R menuChange(String flag,List<SysMenu> sysMenus, List<CompanyMenu> companyMenus);
+    R menuChange(String flag,List<SysMenu> sysMenus, List<TenantCompanyMenu> companyMenus);
 
-    R menuEdit(List<Long> selected, List<Long> unSelected, String flag,List<SysMenu> addSysMenu,List<CompanyMenu> addCompanyMenu);
+    R menuEdit(List<Long> selected, List<Long> unSelected, String flag,List<SysMenu> addSysMenu,List<TenantCompanyMenu> addCompanyMenu);
 
     TenantInfo getTenByCorpId(String corpId);
 
@@ -87,15 +88,15 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     int deleteMenuById(Long menuId);
 
-    List<CompanyMenu> selectCompanyMenuList(CompanyMenu menu, Long userId);
+    List<TenantCompanyMenu> selectCompanyMenuList(TenantCompanyMenu menu, Long userId);
 
-    CompanyMenu getTenantComMenu(Long menuId);
+    TenantCompanyMenu getTenantComMenu(Long menuId);
 
-    String checkComMenuNameUnique(CompanyMenu menu);
+    String checkComMenuNameUnique(TenantCompanyMenu menu);
 
-    int insertComMenu(CompanyMenu menu);
+    int insertComMenu(TenantCompanyMenu menu);
 
-    int updateComMenu(CompanyMenu menu);
+    int updateComMenu(TenantCompanyMenu menu);
 
     boolean hasChildByComMenuId(Long menuId);
 

fs-service/src/main/java/com/fs/tenant/service/impl/TenantInfoServiceImpl.java

@@ -1,17 +1,16 @@
 package com.fs.tenant.service.impl;
 
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.constant.UserConstants;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.TreeSelect;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.common.core.domain.entity.SysUser;
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.company.domain.CompanyMenu;
+
 import com.fs.system.service.ISysMenuService;
 import com.fs.tenant.domain.TenantInfo;
 import com.fs.tenant.mapper.TenantInfoMapper;
@@ -26,7 +25,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -97,7 +95,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
 
             // 从主库查询租户后台菜单表和销售菜单表
             List<SysMenu> sysMenus = baseMapper.selectMenuList(new SysMenu());
-            List<CompanyMenu> companyMenus = baseMapper.selectCompanyMenuList(new CompanyMenu());
+            List<TenantCompanyMenu> companyMenus = baseMapper.selectCompanyMenuList(new TenantCompanyMenu());
 
 
             // 异步初始化表和数据
@@ -179,15 +177,15 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     }
 
     @Override
-    public R menuChange(String flag,List<SysMenu> sysMenus, List<CompanyMenu> companyMenus) {
+    public R menuChange(String flag,List<SysMenu> sysMenus, List<TenantCompanyMenu> companyMenus) {
         if ("sys".equals(flag)) {
             List<SysMenu> menuList = baseMapper.selectTenantMenu();
             List<SysMenu> result = mergeSysMenu(sysMenus, menuList);
             List<TreeSelect> treeSelects = menuService.buildMenuTreeSelect(result);
             return R.ok().put("menus", treeSelects);
         }
-        List<CompanyMenu> menuList = baseMapper.selectTenantComMenu();
-        List<CompanyMenu> result = mergeComMenu(companyMenus, menuList);
+        List<TenantCompanyMenu> menuList = baseMapper.selectTenantComMenu();
+        List<TenantCompanyMenu> result = mergeComMenu(companyMenus, menuList);
         List<TreeSelect> treeSelects = menuService.buildComMenuTreeSelect(result);
         return R.ok().put("menus", treeSelects);
     }
@@ -225,13 +223,13 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
      * @param tenantList 租户菜单
      * @return
      */
-    private List<CompanyMenu> mergeComMenu(List<CompanyMenu> standardList, List<CompanyMenu> tenantList) {
+    private List<TenantCompanyMenu> mergeComMenu(List<TenantCompanyMenu> standardList, List<TenantCompanyMenu> tenantList) {
         // 租户菜单转成 map：key = menuId
-        Map<Long, CompanyMenu> tenantMap = tenantList.stream()
-                .collect(Collectors.toMap(CompanyMenu::getMenuId, item -> item));
+        Map<Long, TenantCompanyMenu> tenantMap = tenantList.stream()
+                .collect(Collectors.toMap(TenantCompanyMenu::getMenuId, item -> item));
 
-        List<CompanyMenu> result = new ArrayList<>();
-        for (CompanyMenu standard : standardList) {
+        List<TenantCompanyMenu> result = new ArrayList<>();
+        for (TenantCompanyMenu standard : standardList) {
             Long menuId = standard.getMenuId();
             // 租户有 → 覆盖
             if (tenantMap.containsKey(menuId)) {
@@ -247,7 +245,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     }
 
     @Override
-    public R menuEdit(List<Long> selected, List<Long> unSelected,String flag,List<SysMenu> addSysMenu,List<CompanyMenu> addCompanyMenu) {
+    public R menuEdit(List<Long> selected, List<Long> unSelected,String flag,List<SysMenu> addSysMenu,List<TenantCompanyMenu> addCompanyMenu) {
         if ("sys".equals(flag)){
             // 更新选中的
             int pitch = baseMapper.updatePitchMenu(selected);
@@ -340,8 +338,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     }
 
     @Override
-    public List<CompanyMenu> selectCompanyMenuList(CompanyMenu menu, Long userId) {
-        List<CompanyMenu> menuList = baseMapper.selectCompanyMenuList(menu);
+    public List<TenantCompanyMenu> selectCompanyMenuList(TenantCompanyMenu menu, Long userId) {
+        List<TenantCompanyMenu> menuList = baseMapper.selectCompanyMenuList(menu);
         // 管理员显示所有菜单信息
 //        if (SysUser.isAdmin(userId))
 //        {
@@ -356,14 +354,14 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     }
 
     @Override
-    public CompanyMenu getTenantComMenu(Long menuId) {
+    public TenantCompanyMenu getTenantComMenu(Long menuId) {
         return baseMapper.selectCompanyMenuById(menuId);
     }
 
     @Override
-    public String checkComMenuNameUnique(CompanyMenu menu) {
+    public String checkComMenuNameUnique(TenantCompanyMenu menu) {
         Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        CompanyMenu info = baseMapper.checkComMenuNameUnique(menu.getMenuName(), menu.getParentId());
+        TenantCompanyMenu info = baseMapper.checkComMenuNameUnique(menu.getMenuName(), menu.getParentId());
         if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -372,12 +370,12 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     }
 
     @Override
-    public int insertComMenu(CompanyMenu menu) {
+    public int insertComMenu(TenantCompanyMenu menu) {
         return baseMapper.insertComMenu(menu);
     }
 
     @Override
-    public int updateComMenu(CompanyMenu menu) {
+    public int updateComMenu(TenantCompanyMenu menu) {
         return baseMapper.updateComMenu(menu);
     }
 

fs-service/src/main/java/com/fs/utils/TenantUtils.java

@@ -1,20 +1,17 @@
 package com.fs.utils;
 
 
-import com.fs.common.annotation.Log;
 import com.fs.common.core.domain.entity.SysMenu;
-import com.fs.company.domain.CompanyMenu;
+
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.jdbc.datasource.init.ScriptUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.*;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 租户工具类
@@ -190,7 +187,7 @@ public class TenantUtils {
         }
     }
 
-    public static void initCompanyMenus(String ip, String dbPort, String dbName, String dbAccount, String dbPwd, List<CompanyMenu> companyMenus) throws SQLException {
+    public static void initCompanyMenus(String ip, String dbPort, String dbName, String dbAccount, String dbPwd, List<TenantCompanyMenu> companyMenus) throws SQLException {
         String url = buildJdbcUrl(ip, dbPort, dbName);
 
         Connection conn = null;
@@ -216,9 +213,9 @@ public class TenantUtils {
             for (int i = 0; i < batchCount; i++) {
                 int start = i * BATCH_SIZE;
                 int end = Math.min(start + BATCH_SIZE, totalSize);
-                List<CompanyMenu> batchList = companyMenus.subList(start, end);
+                List<TenantCompanyMenu> batchList = companyMenus.subList(start, end);
 
-                for (CompanyMenu m : batchList) {
+                for (TenantCompanyMenu m : batchList) {
                     // 顺序必须严格对应
                     pstmt.setLong(1, m.getMenuId());
                     pstmt.setLong(2, m.getParentId());

fs-service/src/main/resources/mapper/tenant/TenantInfoMapper.xml

@@ -124,7 +124,7 @@
         select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark from tenant_company_menu
     </sql>
 
-    <resultMap type="CompanyMenu" id="CompanyMenuResult">
+    <resultMap type="TenantCompanyMenu" id="CompanyMenuResult">
         <result property="menuId"    column="menu_id"    />
         <result property="menuName"    column="menu_name"    />
         <result property="parentId"    column="parent_id"    />
@@ -168,7 +168,7 @@
         <result property="remark"         column="remark"         />
     </resultMap>
 
-    <select id="selectCompanyMenuList" parameterType="CompanyMenu" resultMap="CompanyMenuResult">
+    <select id="selectCompanyMenuList" parameterType="TenantCompanyMenu" resultMap="CompanyMenuResult">
         <include refid="selectCompanyMenuVo"/>
         <where>
             <if test="menuName != null  and menuName != ''"> and menu_name like concat('%', #{menuName}, '%')</if>
@@ -205,7 +205,7 @@
         select count(1) from sys_role_menu where menu_id = #{menuId}
     </select>
 
-    <select id="checkComMenuNameUnique" resultType="com.fs.company.domain.CompanyMenu">
+    <select id="checkComMenuNameUnique" resultType="com.fs.common.core.domain.entity.TenantCompanyMenu">
         <include refid="selectCompanyMenuVo"/>
         where menu_name=#{menuName} and parent_id = #{parentId} limit 1
     </select>
@@ -214,7 +214,7 @@
         select count(1) from tenant_company_menu where parent_id = #{menuId}
     </select>
 
-    <select id="selectTenantComMenu" resultType="com.fs.company.domain.CompanyMenu">
+    <select id="selectTenantComMenu" resultType="com.fs.common.core.domain.entity.TenantCompanyMenu">
         select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
         from company_menu
     </select>
@@ -235,7 +235,7 @@
         SELECT menu_id FROM `company_menu`
     </select>
 
-    <select id="getTenComMenuByIds" resultType="com.fs.company.domain.CompanyMenu">
+    <select id="getTenComMenuByIds" resultType="com.fs.common.core.domain.entity.TenantCompanyMenu">
         SELECT * FROM tenant_company_menu
         WHERE menu_id IN
         <foreach collection="list" item="id" open="(" separator="," close=")">