Merge branch 'xgh_内容中台' into 'developer'

导购查询

See merge request !471

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -1769,6 +1769,9 @@ public class WxStaffController extends WebBaseController {
         resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, clerkList);
         List<String> clerkIdList = resultList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
         List<StaffClerkRelationDTO>  relationList = this.staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIdList, wxEnterpriseId) ;
+        if(CollectionUtils.isEmpty(relationList)) {
+            return RestResponse.failure("-1", "无导购");
+        }
         List<String> retlationIdList = relationList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
         resultList.removeIf(item->{
            return !retlationIdList.contains(item.getClerkId()) ;