From 8b19a417e339441cec66e18a2a5d68337184dada Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 30 八月 2024 09:51:20 +0800
Subject: [PATCH] 修改了登录的代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 e4e2075..b2ba6e9 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
@@ -230,6 +230,14 @@
             return AjaxResult.success(satisfyIds);
         }
 
+    /**
+     * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� uid:闀胯緢id,tpfid:鎴戣嚜宸辩殑zinfoid
+     */
+    @GetMapping("/uidUJd/{uid}/{tpfid}")
+    public AjaxResult findByUidAndUid2(@PathVariable("uid") Long uid ,@PathVariable("tpfid")  Long tpfid){
+        return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
+    }
+
     @GetMapping("/sex/{sex}")
     public AjaxResult findBySex(@PathVariable("sex")  Integer sex)
     {
@@ -284,16 +292,16 @@
      * 瀹舵牴缃�
      */
     @GetMapping("/root")
-    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
-        return zInfoUserService.listWithTree(depth);
+    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth,@PathParam("clanId") Integer clanId){
+        return zInfoUserService.listWithTree(depth, clanId);
     }
     /**
      * 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
      */
     @GetMapping("/allFamInfo")
-        public AjaxResult listAllFamilyPeople()
+        public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
         {
-            return zInfoUserService.listAllFamilyPeople();
+            return zInfoUserService.listAllFamilyPeople(clanId);
         }
 
     /**

--
Gitblit v1.9.1