Merge remote-tracking branch 'origin/prod'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@@ -304,6 +304,14 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
         //轮询排班分为：班组还是灵活；如果是2.灵活人员排班，则不需要查数据库，直接存对应信息
         if (2 == imsSchedulingVo.getPersonType()) {
             Map<String, List<String>> rosters = imsSchedulingVo.getRosters();
+            for (String s : rosters.keySet()) {
+                if (StringUtils.isBlank(s)){
+                    return R.fail("人员排班：无班组长信息，请稍后重试！");
+                }
+                if (CollectionUtil.isEmpty(rosters.get(s))){
+                    return R.fail("人员排班：无人员信息，请稍后重试！");
+                }
+            }
             groupIdsSplit = rosters.keySet().toArray(new String[0]);
             dutyNum = groupIdsSplit.length;
         } else {