查询实验室相关计划为空处理

zd-modules/zd-security/src/main/java/com/zd/security/controller/CheckManageController.java

@@ -1,5 +1,6 @@
 package com.zd.security.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -652,8 +653,13 @@ public class CheckManageController extends AbstractController {
         //获取巡查组身份
         List<CheckPlan> checkPlans = checkPlanService.list(new LambdaQueryWrapper<CheckPlan>().and(i -> i.eq(CheckPlan::getCheckStatus, 1).or().eq(CheckPlan::getCheckStatus, 2)));
         List<Long> checkPlanIdList = checkPlans.stream().map(CheckPlan::getId).collect(Collectors.toList());
-        List<CheckMember> memberList = checkMemberService.list(new LambdaQueryWrapper<CheckMember>().in(CheckMember::getCheckPlanId, checkPlanIdList).eq(CheckMember::getUserId,getCurrentUserId()));
-        if(memberList!=null && !memberList.isEmpty()){
+        LambdaQueryWrapper<CheckMember> queryWrapper = new LambdaQueryWrapper<>();
+        if(CollectionUtil.isNotEmpty(checkPlanIdList)){
+            queryWrapper.in(CheckMember::getCheckPlanId, checkPlanIdList);
+        }
+        queryWrapper.eq(CheckMember::getUserId,getCurrentUserId());
+        List<CheckMember> memberList = checkMemberService.list(queryWrapper);
+        if(CollectionUtil.isNotEmpty(memberList)){
             applyGentle = Boolean.TRUE;
         }else{
             applyGentle = Boolean.FALSE;
@@ -702,7 +708,7 @@ public class CheckManageController extends AbstractController {
                 //有巡查无自查
                 checkManageListVos = checkManageListVos.stream().filter(i -> i.getCheckType() == 1).collect(Collectors.toList());
                 checkManageListVos.forEach(i->{
-                    List<Long> collect = memberList.stream().map(CheckMember::getCheckPlanId).collect(Collectors.toList());
+                    List<Long> collect = Optional.ofNullable(memberList).orElseGet(Collections::emptyList).stream().map(CheckMember::getCheckPlanId).collect(Collectors.toList());
                     if (collect.contains(i.getCheckPlanId())) {
                         i.setIsSelfData(1);
                     }else {