Merge branch 'feature-haoban-role' into developer

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

@@ -530,6 +530,10 @@ public class StaffApiServiceImpl implements StaffApiService {
         storeIds.add(storeId);
         List<String> clerkList = clerkService.getclerkListByStoreIds(storeIds);
         List<StaffClerkRelationDTO> staffRelationList = staffClerkRelationService.listByClerkIds(clerkList);
+        if (CollectionUtils.isEmpty(staffRelationList)) {
+            logger.error("无未绑定导购");
+            return Collections.emptyList();
+        }
         List<String> clerkIds = staffRelationList.stream().filter(s -> s.getClerkId() != null).map(s -> s.getClerkId()).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(clerkIds)) {
             logger.info("无未绑定导购id");