From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 b9de3a2..bca0651 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
@@ -116,6 +116,12 @@
         Long userId = user.getUserId();
         return AjaxResult.success(zInfoUserService.getInfoById(userId));
     }
+    @GetMapping("/{id}")
+    public AjaxResult getInfoById(@PathVariable("id") Long id) {
+      //  SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long userId = id;
+        return AjaxResult.success(zInfoUserService.getInfoById(userId));
+    }
 //
 
     /**
@@ -200,7 +206,14 @@
     public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
         return zInfoUserService.listWithTree(depth);
     }
-
+    /**
+     * 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
+     */
+    @GetMapping("/allFamInfo")
+        public AjaxResult listAllFamilyPeople()
+        {
+            return zInfoUserService.listAllFamilyPeople();
+        }
 
     /**
      * 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -257,6 +270,11 @@
         return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
     }
 
+    @GetMapping("/list/getInfoByfid/{fid}")
+    public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
+    {
+        return zInfoUserService.getInfoByfid(fid);
+    }
 
 
 }

--
Gitblit v1.9.1