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 17e9c93e..43ca733d 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 @@ -121,7 +121,8 @@ public class ResourceController { @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "delFlag", value = "创建者用户id", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "delFlag", value = "创建者用户id", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "deptId", value = "资源所属部门id", paramType = "query", dataType = "String") }) public Result> page(@ApiIgnore @RequestParam Map params) { PageData page = resourceService.page(params); 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 7083ff4c..a82b863e 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 @@ -295,6 +295,9 @@ public class ResourceServiceImpl extends CrudServiceImpl