geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复缺失的service文件

Browse Source
This commit is contained in:
Je
2025-02-11 19:03:24 +08:00
parent a39ae9829c
commit 53f6b750da
16 changed files with 106 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xjrsoft-service/xjrsoft-service-system/src/main/java/com/xjrsoft/system/controller/MenuController.java
View File

@ -65,17 +65,8 @@ public class MenuController {
@GetMapping("/list")
@Operation(summary = "获取所有菜单（不分页）")
public R list() {
List<Long> tenantAuthMenuIds = null;
boolean isAdminTenant = SecureUtil.isAdminTenant();
if (!isAdminTenant) {
tenantAuthMenuIds = menuService.getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return R.ok(new ArrayList<>(0));
}
}
List<Menu> list = menuService.list(Wrappers.lambdaQuery(Menu.class)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty()))
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds));
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty())));
List<MenuListVo> menuListVos = BeanUtil.copyToList(list, MenuListVo.class);
return R.ok(TreeUtil.build(menuListVos));
}
@ -93,14 +84,6 @@ public class MenuController {
@GetMapping("/all-tree")
@Operation(summary = "获取所有菜单（树结构）")
public R allMenuTree(@Valid MenuTreeDto dto) {
List<Long> tenantAuthMenuIds = null;
boolean isAdminTenant = SecureUtil.isAdminTenant();
if (!isAdminTenant&&tenantConfig.getEnabled()) {
tenantAuthMenuIds = menuService.getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return R.ok(new ArrayList<>(0));
}
}
List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class,
MPJWrappers.<Menu>lambdaJoin()
.disableSubLogicDel()
@ -110,7 +93,6 @@ public class MenuController {
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.selectAs(Subsystem::getName, MenuTreeVo::getSystemName)
.eq(ObjectUtils.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds)
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.orderByAsc(Menu::getSortCode));
List<MenuTreeVo> treeVoList = TreeUtil.build(list);

39
xjrsoft-service/xjrsoft-service-system/src/main/java/com/xjrsoft/system/service/impl/MenuServiceImpl.java
View File

@ -61,14 +61,6 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
@Override
public List<MenuVo> getAuthMenuList(MenuTreeDto dto) {
// 租户授权菜单
List<Long> tenantAuthMenuIds = null;
if (BooleanUtils.isTrue(tenantConfig.getEnabled())&&!SecureUtil.isAdminTenant()) {
tenantAuthMenuIds = getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return new ArrayList<>();
}
}
List<UserRoleRelation> relations = userRoleRelationClient.getUserRoleRelationListByUserIdFeign(StpUtil.getLoginIdAsLong());
if (CollectionUtils.isEmpty(relations)) {
return new ArrayList<>();
@ -88,22 +80,21 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
return this.selectJoinList(MenuVo.class,
MPJWrappers.<Menu>lambdaJoin()
.disableSubLogicDel()
.like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
.like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
.like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
// .like(ObjectUtil.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
.select(Menu::getId)
.selectAs(Subsystem::getName, MenuVo::getSystemName)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.leftJoin(WorkflowSchema.class,WorkflowSchema::getFormId, Menu::getFormId)
.selectAs(WorkflowSchema::getId,MenuVo::getSchemaId)
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds)
.eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
.orderByAsc(Subsystem::getSortCode)
.orderByAsc(Menu::getSortCode));
.disableSubLogicDel()
.like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
.like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
.like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
// .like(ObjectUtil.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
.select(Menu::getId)
.selectAs(Subsystem::getName, MenuVo::getSystemName)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.leftJoin(WorkflowSchema.class,WorkflowSchema::getFormId, Menu::getFormId)
.selectAs(WorkflowSchema::getId,MenuVo::getSchemaId)
.eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
.orderByAsc(Subsystem::getSortCode)
.orderByAsc(Menu::getSortCode));
}
public List<Long> getTenantAuthMenuIds(Long tenantId) {