From e5cb65e56ca20f10aa581edfd26e13a114b590f4 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期三, 17 五月 2023 15:16:44 +0800 Subject: [PATCH] 合并了一个方法 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java index 32a7be2..341001e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java @@ -12,6 +12,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfRelation; +import com.ruoyi.domain.dto.EmpowerDto; import com.ruoyi.service.ZInfoUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -19,6 +20,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.websocket.server.PathParam; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; @@ -171,5 +173,48 @@ } + /** + * 鎺堟潈 + */ + @PostMapping("/empower") + public AjaxResult empower(@RequestBody EmpowerDto empowerDto){ + + return zInfoUserService.empower(empowerDto); + } + + /** + * 瀹舵牴缃� + */ + @GetMapping("/root") + public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){ + return zInfoUserService.listWithTree(depth); + } + + + /** + * 鎵惧埌鎵�鏈夌殑鎴愬憳 + */ + @GetMapping("/all") + public AjaxResult listAllPeople(){ + return zInfoUserService.listAllExceptAdmin(); + } + + /** + * 鏂板銆佷慨鏀圭埗瀛愬叧绯� + */ + + @PutMapping("/setParent") + public AjaxResult addParent(@PathParam("fatherId")Long fatherId,@PathParam("motherId")Long motherId){ + return zInfoUserService.addParent(fatherId,motherId); + } + + /** + * 鏍规嵁鏈汉id鏌ヨ鏈汉淇℃伅浠ュ強閰嶅伓淇℃伅 + */ + @GetMapping("/listMyself/{id}") + public AjaxResult listMySelfAndSpouse(@PathVariable("id") Long id){ + return zInfoUserService.listMySelfAndSpouse(id); + } + } -- Gitblit v1.9.1