Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java

@@ -184,7 +184,10 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         }
         if (clerkIdList.contains("-1")) {
             List<HmQrcodeClerkBO> hmQrcodeClerkBOS = hmQrcodeService.listCanAddClerk(wxEnterpriseId, enterpriseId, hmQrcodeQDTO.getCreatorId());
-            clerkIdList = hmQrcodeClerkBOS.stream().map(HmQrcodeClerkBO::getClerkId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(hmQrcodeClerkBOS)) {
+                return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_5.getCode()), "无需要生成活码导购");
+            }
+            clerkIdList = hmQrcodeClerkBOS.stream().map(HmQrcodeClerkBO::getClerkId).filter(StringUtils::isNotBlank).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(clerkIdList)) {
                 return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_5.getCode()), "无需要生成活码导购");
             }