From ab3f4a3c8f2a9f746106d31a8dfce9ef5b121163 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 6 Sep 2024 10:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/goods/controller/ApplyDetailController.java   |  4 +++-
 .../system/user/service/impl/UserServiceImpl.java      | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java
index c233d3e..1ee7cd0 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java
@@ -52,7 +52,9 @@ public class ApplyDetailController extends BladeController {
         if (CollectionUtils.isNotEmpty(details)) {
             for (ApplyDetail detail : details) {
                 Goods goods = goodsService.getById(detail.getProductId());
-                detail.setBrand(goods.getBrand());
+                if(goods != null){
+                    detail.setBrand(goods.getBrand());
+                }
             }
             page.setRecords(details);
         }
diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 38621ba..b1df2ce 100644
--- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.TenantConstant;
 import org.springblade.core.log.exception.ServiceException;
@@ -225,6 +226,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (StringUtil.isNotBlank(user.getName())) {
             queryWrapper.like(User::getName, user.getName());
         }
+        if(StringUtil.isNotBlank(user.getDeptId())){
+            List<Long> deptIds = new ArrayList<>();
+            List<Dept> depts = SysCache.getDeptChild(Long.parseLong(user.getDeptId()));
+            if(CollectionUtils.isNotEmpty(depts)){
+                deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+            }
+            deptIds.add(Long.parseLong(user.getDeptId()));
+            queryWrapper.in(User::getDeptId,deptIds);
+        }
         if (StringUtil.isNotBlank(user.getDeptName())) {
             String deptIds = SysCache.getDeptIdsByFuzzy(AuthUtil.getTenantId(), user.getDeptName());
             if (StringUtil.isNotBlank(deptIds)) {