From 38bf6d26c02f2861abdbe95b8e2a1312e6f30202 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 04 十一月 2024 18:04:48 +0800
Subject: [PATCH] 删除宠物将对应的备忘本一并删除

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index dabcdb4..40ef5ab 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -706,28 +706,25 @@
         ZInfoUser user = getInfoBysysId(userId);
 
 
-        if(user!=null)
-        {
-            Long familyId = user.getFamilyId();
-          //  System.out.println("dddddddddddddddddddd");
-            if(user.getRoleId()==null)
-                user.setRoleId(3L);
-            String roleName = zfRoleService.getById(user.getRoleId()).getName();
-
-            user.setRoleName(roleName);
-//            System.out.println("dddddddddddddddddddd");
-//            System.out.println(familyId);
-//            if(familyId!=null&&familyId!=-1)
-//            {
-//                String familyName = zfFamilyService.getById(familyId).getName();
-//                user.setFamilyName(familyName);
-//            }
-        }
-        else{
-            //鏌ヨsys_user琛�
-
+        if(user==null) {
+            //鍒╃敤userId鏌ヨ
+            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(ZInfoUser::getUserId, userId);
+            List<ZInfoUser> list = list(lqw);
+            if(list.size()>0)
+                user = list.get(0);
+            else
+                return null;
 
         }
+
+        Long familyId = user.getFamilyId();
+        //  System.out.println("dddddddddddddddddddd");
+        if(user.getRoleId()==null)
+            user.setRoleId(3L);
+        String roleName = zfRoleService.getById(user.getRoleId()).getName();
+
+        user.setRoleName(roleName);
         return user;
     }
 

--
Gitblit v1.9.1