diff --git a/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java b/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java index 9c9ae85..545c4b2 100644 --- a/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java +++ b/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java @@ -13,6 +13,7 @@ import com.tiesheng.role.pojos.vo.GroupTypeDTO; import com.tiesheng.role.pojos.vo.ServiceMenuVO; import com.tiesheng.role.service.CoreRoleService; import com.tiesheng.util.pojos.ApiResp; +import com.tiesheng.util.pojos.DaoBase; import com.tiesheng.util.pojos.TokenBean; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -43,6 +44,14 @@ public class CommRoleController { List allOwnerMenus = coreRoleService.getOwnerAuthorityLeafList(tokenBean.getId(), tokenBean.getRoleId()); List list = allOwnerMenus.stream().map(CoreRoleAuthority::getService).collect(Collectors.toList()); + // 添加公开服务 + list.addAll(coreRoleService.getServerMapper().selectList(new QueryWrapper() + .eq("is_public", 1).eq("is_deleted", 0).eq("is_open", 1) + ).stream().map(DaoBase::getId).collect(Collectors.toList())); + + // 去除重复 + list = CollUtil.distinct(list); + List roleServerList = new ArrayList<>(); if (CollUtil.isNotEmpty(list)) { roleServerList = coreRoleService.getServerMapper().selectList(new QueryWrapper() diff --git a/springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java b/springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java index c678c00..34fbc98 100644 --- a/springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java +++ b/springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java @@ -66,6 +66,12 @@ public class CoreRoleServer extends DaoBase { @TableField(value = "ext3") private String ext3; + /** + * 是否公开 + */ + @TableField(value = "is_public") + private Integer isPublic; + /** * 获取名称 * @@ -227,4 +233,22 @@ public class CoreRoleServer extends DaoBase { public void setExt3(String ext3) { this.ext3 = ext3; } + + /** + * 获取是否公开 + * + * @return is_public - 是否公开 + */ + public Integer getIsPublic() { + return isPublic; + } + + /** + * 设置是否公开 + * + * @param isPublic 是否公开 + */ + public void setIsPublic(Integer isPublic) { + this.isPublic = isPublic; + } } \ No newline at end of file diff --git a/springboot-role/src/main/resources/db/migration/tiesheng_v2.0.22.sql b/springboot-role/src/main/resources/db/migration/tiesheng_v2.0.22.sql new file mode 100644 index 0000000..33f9060 --- /dev/null +++ b/springboot-role/src/main/resources/db/migration/tiesheng_v2.0.22.sql @@ -0,0 +1,3 @@ +alter table core_role_server + add is_public int default 0 null comment '是否公开'; + diff --git a/springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml b/springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml index 4f412a7..5b22c72 100644 --- a/springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml +++ b/springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml @@ -17,10 +17,11 @@ + id, create_time, update_time, is_deleted, `name`, remark, logo, sort, is_open, link, - ext1, ext2, ext3 + ext1, ext2, ext3, is_public \ No newline at end of file