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 { " \n" + String.format("%d\n %d\n", page, size) + String.format("%s\n %s\n", pxcol, order); -// if (bmname != null){ -// parame = parame + String.format("%s",bmname); -// } - if (zyname != null) { + if (StringUtils.isNotEmpty(bmname)) { + parame = parame + String.format("%s", bmname); + } + if (StringUtils.isNotEmpty(zyname)) { parame = parame + String.format("%s", zyname); } parame = parame + ""; @@ -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; }