diff --git a/renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java b/renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java
index 4d6c4697..1268f35a 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java
@@ -68,6 +68,7 @@ public class DemandDataController {
         if (tDemandDataDTO.getId() == null) {
             return null;
         }
+
         logger.info("-------------------1.保存申请表单成功--------------------------");
         // 仿照请求接口 /act/running/startOfBusinessKey
         ProcessStartDTO processStartDTO = new ProcessStartDTO();
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index e97c5549..fd11d13e 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -55,7 +55,8 @@ public class ResourceController {
             @ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"),
             //@ApiImplicitParam(name = "name", value = "资源名称", paramType = "query", dataType="String") ,
             @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
     })
     //@RequiresPermissions("resource:resource:page")
     public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
index d249e22d..b50c40d3 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
@@ -1,10 +1,10 @@
 package io.renren.modules.resource.entity;
 
+import com.baomidou.mybatisplus.annotation.*;
+import io.renren.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.baomidou.mybatisplus.annotation.*;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,14 +16,14 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("tb_data_resource")
-public class ResourceEntity {
+public class ResourceEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	* 主键
-	*/
-	@TableId(type = IdType.INPUT)
-	private Long id;
+//	/**
+//	* 主键
+//	*/
+//	@TableId(type = IdType.INPUT)
+//	private Long id;
 	/**
 	* 类型：基础设施，数据资源等
 	*/
@@ -72,16 +72,16 @@ public class ResourceEntity {
 	* 删除标志：0:正常；1:已删除；9其他
 	*/
 	private Integer delFlag;
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-	private Long creator;
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-	private Date createDate;
+//	/**
+//	* 创建人
+//	*/
+//	@TableField(fill = FieldFill.INSERT)
+//	private Long creator;
+//	/**
+//	* 创建时间
+//	*/
+//	@TableField(fill = FieldFill.INSERT)
+//	private Date createDate;
 	/**
 	* 修改人
 	*/
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index cac66963..71b1c33f 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -65,9 +65,13 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public QueryWrapper<ResourceEntity> getWrapper(Map<String, Object> params) {
         QueryWrapper<ResourceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("type", params.get("type").toString())
-                .eq("del_flag", 0)
                 //.like(StringUtils.isNotBlank(params.get("name").toString()),"name", params.get("name").toString())
                 .orderByDesc("create_date");
+        if (params.containsKey("creator")) { //查该用户创建的资源
+            wrapper.eq("creator", params.get("creator").toString());
+        } else { // 公共页（只出正常的）
+            wrapper.eq("del_flag", 0);
+        }
         return wrapper;
     }