From 6ca92d239a108322cd090fc4db2ec5445ddabb4c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 11 Sep 2023 12:10:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3sql-inject?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/plugins/server/XDeptServer.java   |  5 ++---
 .../xpack/dept/dto/request/XpackDeptGridRequest.java   | 10 ++++++++++
 .../plugins/xpack/dept/service/DeptXpackService.java   |  7 +++++--
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/dept/dto/request/XpackDeptGridRequest.java

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<DeptNodeResponse> search(@RequestBody XpackGridRequest request){
+    public List<DeptNodeResponse> search(@RequestBody XpackDeptGridRequest request){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
         List<XpackSysDept> nodes = deptService.nodesTreeByCondition(request);
-        List<DeptNodeResponse> 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<XpackSysDept> nodesByPid(Long pid);
 
-    public abstract List<XpackSysDept> nodesTreeByCondition(XpackGridRequest request);
+    public abstract List<XpackSysDept> nodesTreeByCondition(XpackDeptGridRequest request);
 
     public abstract List<XpackDeptTreeNode> searchTree(Long deptId);
 
@@ -23,8 +23,11 @@ public abstract class DeptXpackService extends PluginMenuService {
     public abstract int batchDelete(List<XpackDeleteDept> requests);
 
     public abstract void move(XpackMoveDept xpackMoveDept);
+
     public abstract void bindUser(XpackDeptBindRequest request);
+
     public abstract void unBindUsers(XpackDeptBindRequest request);
+
     public abstract List<DeptUserItemDTO> queryBinded(XpackDeptUserRequest request, boolean isPage);