diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java
index dd8cbbe2e..17e3922d2 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java
@@ -155,4 +155,24 @@ public class SysDeptController {
 		return sysDeptService.importDept(excelVOList, bindingResult);
 	}
 
+	/**
+	 * 查询全部部门包含用户
+	 * @param parentDeptId 父部门ID
+	 * @param type 查询类型
+	 */
+	@GetMapping("/org")
+	public R listOrgTree(Long parentDeptId, String type) {
+		return R.ok(sysDeptService.listOrgTree(parentDeptId, type));
+	}
+
+	/**
+	 * 模糊搜索用户
+	 * @param username 用户名/拼音/首字母
+	 * @return 匹配到的用户
+	 */
+	@GetMapping("/org/user/search")
+	public R getOrgTreeUser(@RequestParam String username) {
+		return R.ok(sysDeptService.getOrgTreeUser(username));
+	}
+
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java
index ad5cf0b94..c62aeaf4c 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java
@@ -23,10 +23,12 @@ import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.admin.api.entity.SysDept;
 import com.pig4cloud.pigx.admin.api.vo.DeptExcelVO;
+import com.pig4cloud.pigx.admin.api.vo.OrgTreeVO;
 import com.pig4cloud.pigx.common.core.util.R;
 import org.springframework.validation.BindingResult;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -70,4 +72,18 @@ public interface SysDeptService extends IService<SysDept> {
 	 */
 	List<Long> listDeptLeader(Long deptId);
 
+	/**
+	 * 查询全部部门包含用户
+	 * @param parentDeptId 父部门ID
+	 * @param type 查询类型
+	 */
+	Map<String, Object> listOrgTree(Long parentDeptId, String type);
+
+	/**
+	 * 根据用户名模糊搜索用户
+	 * @param username 用户名
+	 * @return List user
+	 */
+	List<OrgTreeVO> getOrgTreeUser(String username);
+
 }