From 7a4475a4a35c06244875b0b1888bb83c5351ca47 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 13 十月 2024 22:22:57 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 11 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 b904ad3..36f9b01 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.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ShareMore;
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfDoctor;
 import com.ruoyi.domain.ZfRelation;
@@ -23,6 +24,7 @@
 import com.ruoyi.service.ZfFamilyService;
 import com.ruoyi.service.ZfRoleService;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +53,7 @@
 
     @Resource
     private ZInfoUserService zInfoUserService;
+
 
     @Resource
     private ZfFamilyService zfFamilyService;
@@ -118,12 +121,25 @@
     public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
-        return AjaxResult.success(zInfoUserService.getInfoById(userId));
+
+
+
+        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
+        if(zInfoUser!=null)
+        {
+            return AjaxResult.success(zInfoUser);
+        }
+        else
+            return AjaxResult.success(user);
     }
     @GetMapping("/{id}")
     public AjaxResult getInfoById(@PathVariable("id") Long id) {
       //  SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = id;
+
+
+        //鏌ヨsys_user琛�
+      //  SysUser sysUser = sysUserService.selectUserById(userId);
         return AjaxResult.success(zInfoUserService.getInfoById(userId));
     }
 //
@@ -205,8 +221,8 @@
     /**
      * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄瓙瀛� tpfid:鑷繁id 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�  涓嶆槸鏈鐨勪汉閫�
      */
-    @GetMapping("/uidAndUJd/{tpfid}/{sex}")
-        public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex)
+    @GetMapping("/uidAndUJd/{tpfid}/{sex}/{clanId}")
+        public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex, @PathVariable("clanId")  Integer clanId)
         {
 //            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
             //sex == 0 -> 鐢�
@@ -216,7 +232,7 @@
             else if (sex == 0){
                 sex = 1;
             }
-            List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+            List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
             List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
             HashMap<Long,String> bs = new HashMap<>();
             for (ZInfoUser zInfoUser:zInfoUsers) {
@@ -238,8 +254,8 @@
         return AjaxResult.success( zInfoUserService.findByuid(uid,tpfid));
     }
 
-    @GetMapping("/sex/{sex}")
-    public AjaxResult findBySex(@PathVariable("sex")  Integer sex)
+    @GetMapping("/sex/{sex}/{clanId}")
+    public AjaxResult findBySex(@PathVariable("sex")  Integer sex, @PathVariable("clanId")  Integer clanId)
     {
 //            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
         //sex == 0 -> 鐢�
@@ -249,7 +265,7 @@
         else if (sex == 0){
             sex = 1;
         }
-        List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+        List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
         List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
         HashMap<Long,String> bs = new HashMap<>();
         for (ZInfoUser zInfoUser:zInfoUsers) {
@@ -292,16 +308,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);
         }
 
     /**
@@ -365,6 +381,14 @@
         return zInfoUserService.getInfoByfid(fid);
     }
 
+    /**
+     //     * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+     //     */
+    @PostMapping("/byName")
+    public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+    {
+        return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+    }
 
 }
 

--
Gitblit v1.9.1