From 0f4d2c0bd0cff7307b40688f27ec31429878024c Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 16 Dec 2022 10:49:26 +0800
Subject: [PATCH] =?UTF-8?q?/resource/page=20=E6=8E=A5=E5=8F=A3=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BC=A0=E9=83=A8=E9=97=A8id=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/modules/resource/controller/ResourceController.java | 3 ++-
 .../modules/resource/service/impl/ResourceServiceImpl.java     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
         PageData<ResourceDTO> 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<ResourceDao, ResourceEn
                 case "creator":
                     wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString());
                     break;
+                case "deptId":
+                    wrapper.eq(StringUtils.isNotBlank(params.get("deptId").toString()), "dept_id", Long.parseLong(params.get("deptId").toString()));
+                    break;
                 default:
                     break;
             }