diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index b5ad29898a..cc9b697be1 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -64,17 +64,16 @@ public class XDeptServer { @ApiOperation("搜索组织树") @PostMapping("/search") - public List search(@RequestBody XpackGridRequest request){ + public List search(@RequestBody XpackDeptGridRequest request){ DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class); List nodes = deptService.nodesTreeByCondition(request); - List nodeResponses = nodes.stream().map(node -> { + return nodes.stream().map(node -> { DeptNodeResponse deptNodeResponse = BeanUtils.copyBean(new DeptNodeResponse(), node); deptNodeResponse.setHasChildren(node.getSubCount() > 0); deptNodeResponse.setLeaf(node.getSubCount() == 0); deptNodeResponse.setTop(node.getPid() == 0L); return deptNodeResponse; }).collect(Collectors.toList()); - return nodeResponses; } @ApiIgnore diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/dto/request/XpackDeptGridRequest.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/dto/request/XpackDeptGridRequest.java new file mode 100644 index 0000000000..5db9f1f0fc --- /dev/null +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/dto/request/XpackDeptGridRequest.java @@ -0,0 +1,10 @@ +package io.dataease.plugins.xpack.dept.dto.request; + +import io.dataease.plugins.common.request.KeywordRequest; +import lombok.Data; + +@Data +public class XpackDeptGridRequest extends KeywordRequest { + + private Long pid = 0L; +} diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/service/DeptXpackService.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/service/DeptXpackService.java index 01238bf495..30348a0ac9 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/service/DeptXpackService.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/service/DeptXpackService.java @@ -1,18 +1,18 @@ package io.dataease.plugins.xpack.dept.service; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.common.service.PluginMenuService; import io.dataease.plugins.xpack.dept.dto.request.*; import io.dataease.plugins.xpack.dept.dto.response.DeptUserItemDTO; import io.dataease.plugins.xpack.dept.dto.response.XpackDeptTreeNode; import io.dataease.plugins.xpack.dept.dto.response.XpackSysDept; + import java.util.List; public abstract class DeptXpackService extends PluginMenuService { public abstract List nodesByPid(Long pid); - public abstract List nodesTreeByCondition(XpackGridRequest request); + public abstract List nodesTreeByCondition(XpackDeptGridRequest request); public abstract List searchTree(Long deptId); @@ -23,8 +23,11 @@ public abstract class DeptXpackService extends PluginMenuService { public abstract int batchDelete(List requests); public abstract void move(XpackMoveDept xpackMoveDept); + public abstract void bindUser(XpackDeptBindRequest request); + public abstract void unBindUsers(XpackDeptBindRequest request); + public abstract List queryBinded(XpackDeptUserRequest request, boolean isPage);