Commit b027b30f by guojuxing

操作模块初始化修改:查询全部

parent 2ca1f9d0
...@@ -116,6 +116,17 @@ public class MenuApiServiceImpl implements MenuApiService { ...@@ -116,6 +116,17 @@ public class MenuApiServiceImpl implements MenuApiService {
} }
@Override @Override
public ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId) {
//查询超级管理员
TabSysUser tabSysUser = userService.getUserByEnterpriseId(enterpriseId);
if (tabSysUser == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有超级管理员,数据错误");
}
String versionCode = enterpriseApiService.getEnterpriseById(enterpriseId).getResult().getVersionCode();
return listUserMenu(tabSysUser.getUserId(), versionCode);
}
@Override
public ServiceResponse<List<MenuDTO>> listMenuTree(MenuListQO params) { public ServiceResponse<List<MenuDTO>> listMenuTree(MenuListQO params) {
if (params.getIsGIC() == null) { if (params.getIsGIC() == null) {
params.setIsGIC(MenuProjectConstants.DEFAULT_PROJECT_CODE); params.setIsGIC(MenuProjectConstants.DEFAULT_PROJECT_CODE);
......
...@@ -122,7 +122,7 @@ public class LoginController { ...@@ -122,7 +122,7 @@ public class LoginController {
} }
//查询全部的操作模块 //查询全部的操作模块
Map<String, MenuInfo> moduleMap = new HashMap<>(16); Map<String, MenuInfo> moduleMap = new HashMap<>(16);
ServiceResponse<List<MenuDTO>> allGicMenu = menuApiService.getSuperAdminGicMenu(enterpriseId); ServiceResponse<List<MenuDTO>> allGicMenu = menuApiService.getSuperAdminMenuNotTree(enterpriseId);
if (allGicMenu.isSuccess()) { if (allGicMenu.isSuccess()) {
List<MenuDTO> temp = allGicMenu.getResult(); List<MenuDTO> temp = allGicMenu.getResult();
List<MenuInfo> tempMenuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, temp); List<MenuInfo> tempMenuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, temp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment