From 67e9979e5892f6f1a2b592c3f51dd6e6ed7903ff Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 28 Sep 2023 10:34:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BD=93=E7=B3=BB=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EnterpriseStandardAuthUserServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index a74d6df3..4d47dd34 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; @@ -14,9 +15,7 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.sys.entity.LawsEnterpriseStandardLevel; -import com.jero.modules.sys.entity.LawsGrade; import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService; -import com.jero.modules.sys.service.ILawsGradeService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -27,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author ThinkBook @@ -76,14 +74,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl standardIds = new ArrayList<>(); records.forEach(kv -> standardIds.add(String.valueOf(kv.get(FieldCommon.ID)))); List esList = enterpriseStandardService.list(new LambdaQueryWrapper() - .in(LawsEnterpriseStandard::getId, standardIds) + .in(CollUtil.isNotEmpty(standardIds), LawsEnterpriseStandard::getId, standardIds) .eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue())); Map esMap = esList.stream().collect(Collectors.toMap(LawsEnterpriseStandard::getId, e -> e)); // 查询临时授权人员 Date date = new Date(); LambdaQueryWrapper authUserWrapper = new LambdaQueryWrapper<>(); - authUserWrapper.in(EnterpriseStandardAuthUser::getStandardId, standardIds); + authUserWrapper.in(CollUtil.isNotEmpty(standardIds), EnterpriseStandardAuthUser::getStandardId, standardIds); authUserWrapper.eq(EnterpriseStandardAuthUser::getAuthUser, userId); authUserWrapper.ge(EnterpriseStandardAuthUser::getAuthExpireDate, date); List authUserList = list(authUserWrapper); @@ -91,7 +89,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl authDeptWrapper = new LambdaQueryWrapper<>(); - authDeptWrapper.in(EnterpriseStandardAuthDept::getStandardId, standardIds); + authDeptWrapper.in(CollUtil.isNotEmpty(standardIds), EnterpriseStandardAuthDept::getStandardId, standardIds); authDeptWrapper.eq(EnterpriseStandardAuthDept::getAuthDept, deptId); List authDeptList = authDeptService.list(authDeptWrapper); authDeptWrapper.ge(EnterpriseStandardAuthDept::getAuthExpireDate, date);