diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java index 49b762bed9..b7289f3fbb 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java @@ -37,9 +37,7 @@ public class StatusItem implements Serializable { @Size(min = 1, max = 50, message = "{status_item.scope_type.length_range}", groups = {Created.class, Updated.class}) private String scopeType; - @Schema(description = "项目状态所关联的组织状态ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{status_item.ref_id.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{status_item.ref_id.length_range}", groups = {Created.class, Updated.class}) + @Schema(description = "项目状态所关联的组织状态ID") private String refId; @Schema(description = "组织或项目ID", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java index 749cbc0c35..0da552124a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java @@ -50,10 +50,6 @@ public class Template implements Serializable { @NotNull(message = "{template.enable_third_part.not_blank}", groups = {Created.class}) private Boolean enableThirdPart; - @Schema(description = "是否是默认模板", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "{template.enable_default.not_blank}", groups = {Created.class}) - private Boolean enableDefault; - @Schema(description = "项目模板所关联的组织模板ID") private String refId; @@ -75,7 +71,6 @@ public class Template implements Serializable { scopeType("scope_type", "scopeType", "VARCHAR", false), scopeId("scope_id", "scopeId", "VARCHAR", false), enableThirdPart("enable_third_part", "enableThirdPart", "BIT", false), - enableDefault("enable_default", "enableDefault", "BIT", false), refId("ref_id", "refId", "VARCHAR", false), scene("scene", "scene", "VARCHAR", false); diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java index 86d1d22ecd..feffbfd0e6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java @@ -764,66 +764,6 @@ public class TemplateExample { return (Criteria) this; } - public Criteria andEnableDefaultIsNull() { - addCriterion("enable_default is null"); - return (Criteria) this; - } - - public Criteria andEnableDefaultIsNotNull() { - addCriterion("enable_default is not null"); - return (Criteria) this; - } - - public Criteria andEnableDefaultEqualTo(Boolean value) { - addCriterion("enable_default =", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultNotEqualTo(Boolean value) { - addCriterion("enable_default <>", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultGreaterThan(Boolean value) { - addCriterion("enable_default >", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultGreaterThanOrEqualTo(Boolean value) { - addCriterion("enable_default >=", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultLessThan(Boolean value) { - addCriterion("enable_default <", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultLessThanOrEqualTo(Boolean value) { - addCriterion("enable_default <=", value, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultIn(List values) { - addCriterion("enable_default in", values, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultNotIn(List values) { - addCriterion("enable_default not in", values, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultBetween(Boolean value1, Boolean value2) { - addCriterion("enable_default between", value1, value2, "enableDefault"); - return (Criteria) this; - } - - public Criteria andEnableDefaultNotBetween(Boolean value1, Boolean value2) { - addCriterion("enable_default not between", value1, value2, "enableDefault"); - return (Criteria) this; - } - public Criteria andRefIdIsNull() { addCriterion("ref_id is null"); return (Criteria) this; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml index 311b8da9c1..39e9e7b686 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml @@ -12,7 +12,6 @@ - @@ -76,7 +75,7 @@ id, `name`, remark, internal, update_time, create_time, create_user, scope_type, - scope_id, enable_third_part, enable_default, ref_id, scene + scope_id, enable_third_part, ref_id, scene