条件合并null修复

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertInviteManage.java

@@ -279,7 +279,7 @@ public class ExpertInviteManage {
         Set<Long> expertIdsNotIn = new HashSet<>();
         if (CollUtil.isNotEmpty(merge.getExpertIdsIn())) {
             expertIdsIn.addAll(merge.getExpertIdsIn());
-        } else {
+        } else if (CollUtil.isNotEmpty(merge.getExpertIdsNotIn())) {
             expertIdsNotIn.addAll(merge.getExpertIdsNotIn());
         }
         // 处理专家层级
@@ -333,8 +333,8 @@ public class ExpertInviteManage {
      * @param randomRule     随机抽取
      * @param invitedExperts 已抽取人员
      * @param count          抽取数量
-     * @param msTime          会议开始时间
-     * @param meTime            会议结束时间
+     * @param msTime         会议开始时间
+     * @param meTime         会议结束时间
      * @return {@link ExpertChooseDTO}
      * @author WendyYang
      **/
@@ -356,7 +356,7 @@ public class ExpertInviteManage {
         Set<Long> expertIdsNotIn = new HashSet<>();
         if (CollUtil.isNotEmpty(merge.getExpertIdsIn())) {
             expertIdsIn.addAll(merge.getExpertIdsIn());
-        } else {
+        } else if (CollUtil.isNotEmpty(merge.getExpertIdsNotIn())) {
             expertIdsNotIn.addAll(merge.getExpertIdsNotIn());
         }
         LambdaQueryWrapper<ExpertUserFullInfo> query = buildBaseExpertQuery();