bug：用户组织架构新增线一级别组织层级，用户信息获取逻辑未更新导致部分组织架构校验逻辑校验失败 TencentBlueKing#9967

yjieliang · Feb 27, 2024 · 2fc0ee6 · 2fc0ee6
1 parent e843806
commit 2fc0ee6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/...pi-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStorePublishersResource.kt b/...pi-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStorePublishersResource.kt
@@ -28,21 +28,21 @@
 package com.tencent.devops.store.api.common
 
 import com.tencent.devops.common.api.pojo.Result
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
 import javax.ws.rs.Consumes
 import javax.ws.rs.PUT
 import javax.ws.rs.Path
 import javax.ws.rs.Produces
 import javax.ws.rs.core.MediaType
 
-@Api(tags = ["OP_STORE_PUBLISHERS"], description = "OP-研发商店-发布者")
+@Tag(name = "OP_STORE_PUBLISHERS", description = "OP-研发商店-发布者")
 @Path("/op/store/publishers")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 interface OpStorePublishersResource {
 
-    @ApiOperation("同步所有个人发布者组织架构信息")
+    @Operation(summary = "同步所有个人发布者组织架构信息")
     @PUT
     @Path("/refresh/person")
     fun refreshPersonPublisherGroup(): Result<Boolean>

diff --git a/...store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/PublisherDeptInfo.kt b/...store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/PublisherDeptInfo.kt
@@ -27,31 +27,30 @@
 
 package com.tencent.devops.store.pojo.common
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
+import io.swagger.v3.oas.annotations.media.Schema
 
-@ApiModel("发布者机构信息报文体")
+@Schema(title = "发布者机构信息报文体")
 data class PublisherDeptInfo(
-    @ApiModelProperty("发布者标识")
+    @get:Schema(title = "发布者标识")
     val publisherCode: String,
-    @ApiModelProperty("一级部门ID")
+    @get:Schema(title = "一级部门ID")
     val firstLevelDeptId: Long,
-    @ApiModelProperty("一级部门名称")
+    @get:Schema(title = "一级部门名称")
     val firstLevelDeptName: String,
-    @ApiModelProperty("二级部门ID")
+    @get:Schema(title = "二级部门ID")
     val secondLevelDeptId: Long,
-    @ApiModelProperty("二级部门名称")
+    @get:Schema(title = "二级部门名称")
     val secondLevelDeptName: String,
-    @ApiModelProperty("三级部门ID")
+    @get:Schema(title = "三级部门ID")
     val thirdLevelDeptId: Long,
-    @ApiModelProperty("三级部门名称")
+    @get:Schema(title = "三级部门名称")
     val thirdLevelDeptName: String,
-    @ApiModelProperty("四级部门ID")
+    @get:Schema(title = "四级部门ID")
     val fourthLevelDeptId: Long? = null,
-    @ApiModelProperty("四级部门名称")
+    @get:Schema(title = "四级部门名称")
     val fourthLevelDeptName: String? = null,
-    @ApiModelProperty("实体组织架构")
+    @get:Schema(title = "实体组织架构")
     var organizationName: String = "",
-    @ApiModelProperty("所属工作组BG")
+    @get:Schema(title = "所属工作组BG")
     val bgName: String
 )