From f356a0d4d947c7db005e75e7db0d3de2bd405e7e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 11 六月 2024 23:07:12 +0800
Subject: [PATCH] 把代码加回来了

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |    5 +----
 1 files changed, 1 insertions(+), 4 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 83843cb..4dbf8f9 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
@@ -3,8 +3,6 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -28,7 +26,6 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -639,7 +636,7 @@
             user.setRoleName(roleName);
             System.out.println("dddddddddddddddddddd");
             System.out.println(familyId);
-            if(familyId!=-1)
+            if(familyId!=null||familyId!=-1)
             {
                 String familyName = zfFamilyService.getById(familyId).getName();
                 user.setFamilyName(familyName);

--
Gitblit v1.9.1