Merge branch 'dev' into 'test'

update:增加门户管理允许匿名访问

See merge request jygk/dsc!6
This commit is contained in:
wencai he
2025-12-05 07:25:06 +00:00
2 changed files with 2 additions and 3 deletions

View File

@@ -65,9 +65,7 @@ public class PortalSaveReqVO {
private Integer status; private Integer status;
@Schema(description = "权限标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "portal:purchase:access") @Schema(description = "权限标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "portal:purchase:access")
@NotEmpty(message = "权限标识不能为空")
@Size(max = 100, message = "权限标识长度不能超过100个字符") @Size(max = 100, message = "权限标识长度不能超过100个字符")
@Pattern(regexp = "^portal:[a-z]+:access$", message = "权限标识格式不正确,应为 portal:{module}:access")
private String permission; private String permission;
@Schema(description = "打开方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "打开方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

View File

@@ -16,6 +16,7 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -50,7 +51,7 @@ public class PortalServiceImpl implements PortalService {
portalMapper.insert(portal); portalMapper.insert(portal);
// 2. 自动创建对应的菜单权限 // 2. 自动创建对应的菜单权限
if (createReqVO.getParentMenuId() != null) { if (createReqVO.getParentMenuId() != null&& StringUtils.hasText(createReqVO.getPermission())) {
syncMenuPermission(portal, createReqVO.getParentMenuId(), null); syncMenuPermission(portal, createReqVO.getParentMenuId(), null);
} }