diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/ZoneResource.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/ZoneResource.java
index 878ea01c2..df9bbf23b 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/ZoneResource.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/ZoneResource.java
@@ -66,7 +66,7 @@ public class ZoneResource extends ZoneSort {
@ApiModelProperty(value = "资源简介")
private String summary;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)")
private String auditStatus;
/**
* 是否首页展示(0代表不展示 1代表展示)
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDataVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDataVo.java
index 449034ac7..c02b61b08 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDataVo.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDataVo.java
@@ -66,7 +66,7 @@ public class ZoneResourceDataVo {
@ApiModelProperty(value = "资源简介")
private String summary;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)")
private String auditStatus;
/**
* 审核时间
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceInputVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceInputVo.java
index f1520ce42..fb43c0b47 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceInputVo.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceInputVo.java
@@ -20,7 +20,7 @@ public class ZoneResourceInputVo {
@NotNull
private String name;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)", hidden = true)
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)", hidden = true)
private String auditStatus = "1";
@ApiModelProperty(value = "资源简介")
private String summary;
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceOpenSearchVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceOpenSearchVo.java
index 47e87f515..f85c7bc79 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceOpenSearchVo.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceOpenSearchVo.java
@@ -53,8 +53,8 @@ public class ZoneResourceOpenSearchVo extends BaseEntity {
@ApiModelProperty(value = "是否根据下载次数降序排序(与orderByColumn互斥,该属性优先级更高)")
private Boolean orderByDownloadCount = false;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
- private String auditStatus;
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)",hidden = true)
+ private String auditStatus="1";
public ZoneResource toZoneResource() {
ZoneResource target = new ZoneResource();
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceSearchVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceSearchVo.java
index 854d0c0c4..4833fdc3a 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceSearchVo.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceSearchVo.java
@@ -19,7 +19,7 @@ public class ZoneResourceSearchVo extends ZoneResourceOpenSearchVo {
@NotNull
private Long zoneId;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿 all:所有)")
private String auditStatus;
/**
* 资源分类:SKILL/MODEL/DATASET(NULL表示原有专区资源)
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceUpdateVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceUpdateVo.java
index b84fda27c..dd9343d02 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceUpdateVo.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceUpdateVo.java
@@ -35,7 +35,7 @@ public class ZoneResourceUpdateVo {
@ApiModelProperty(value = "是否首页展示(0代表不展示 1代表展示)")
private String isHomepage;
- @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)", hidden = true)
+ @ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)", hidden = true)
private String auditStatus = "1";
@ApiModelProperty(value = "备注", hidden = true)
private String remark;
diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/utils/ZoneConstants.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/utils/ZoneConstants.java
index acf0a783d..76ec244cc 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/utils/ZoneConstants.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/utils/ZoneConstants.java
@@ -62,6 +62,10 @@ public class ZoneConstants {
* 资源审核状态-审核通过
*/
public final static String RESOURCE_AUDIT_PASS = "1";
+ /**
+ * 资源审核状态-所有状态
+ */
+ public final static String RESOURCE_AUDIT_ALL = "all";
/**
* 资源审核状态-审核未通过
*/
diff --git a/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml b/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml
index f86defd8f..d82767721 100644
--- a/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml
+++ b/microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceMapper.xml
@@ -146,10 +146,12 @@
and zr.dept_id = #{deptId}
and zr.create_by = #{createBy}
and zr.keywords like concat('%', #{keywords}, '%')
- and zr.resource_category = #{resourceCategory}
+ and zr.resource_category =
+ #{resourceCategory}
+
- and zr.audit_status = #{auditStatus}
+ and zr.audit_status = #{auditStatus}
and zr.audit_status = '1'