From f39a9e473e485c05585fa19a95379b7c569a2070 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 2 Dec 2022 14:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=B1=80=E6=95=B0=E6=8D=AE=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8C=89=E7=85=A7=E4=B8=8A=E7=BA=BF=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/TsingtaoDataResourceService.java          | 12 +++++++-----
 .../modules/resource/dto/GetDataResourceListDto.java |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
index 8459dda4..8556c316 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.renren.common.utils.SpringContextUtils;
 import io.renren.modules.resource.dataResource.AbstractDataResourceService;
 import io.renren.modules.resource.dto.GetDataResourceListDto;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
@@ -38,6 +39,7 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
         String pxcol = dto.getOrderField();
         String order = dto.getOrderType();
         String zyname = dto.getServiceName();
+        String bmname = dto.getDeptId();
 
         if (page == null) page = 1;
         if (size == null) size = 10;
@@ -50,10 +52,10 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
                 "  <soap:Body><ZWCJ_mainPort xmlns=\"http://tempuri.org/\">\n" +
                 String.format("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n", page, size) +
                 String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n", pxcol, order);
-//        if (bmname != null){
-//            parame = parame + String.format("<bmname>%s</bmname>",bmname);
-//        }
-        if (zyname != null) {
+        if (StringUtils.isNotEmpty(bmname)) {
+            parame = parame + String.format("<bmname>%s</bmname>", bmname);
+        }
+        if (StringUtils.isNotEmpty(zyname)) {
             parame = parame + String.format("<zyname>%s</zyname>", zyname);
         }
         parame = parame + "</ZWCJ_mainPort></soap:Body></soap:Envelope>";
@@ -86,7 +88,7 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
     }
 
     /**
-     * 获取各部门上架数据资源的数目情况
+     * 获取各部门上架数据资源的数目情况（数据资源左侧树）
      *
      * @return
      */
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java
index d984ca77..61d083d1 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java
@@ -20,4 +20,6 @@ public class GetDataResourceListDto {
     private Integer pageNum;
     //分页大小
     private Integer pageSize;
+    // 数据资源发布部门id
+    private String deptId;
 }