Merge branch 'master_xgh_我的客户迭代' into 'xgh_内容中台'

导购查询

See merge request !423

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

@@ -1731,7 +1731,7 @@ public class WxStaffController extends WebBaseController {
         }else if(clerkType==1) {
             List<ClerkListDTO> clerkList = clerkService.getClerkByStoreId(enterpriseId, clerk.getStoreId());
             if (CollectionUtils.isEmpty(clerkList)) {
-                return null;
+                return RestResponse.failure("-1", "无导购");
             }
             resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, clerkList);
         }else if(clerkType==2) {
@@ -1756,6 +1756,7 @@ public class WxStaffController extends WebBaseController {
             page.setParams(params);
             logger.info("查询条件:{}", JSON.toJSONString(params));
             page = this.clerkService.listStoreClerkByPage(page);
+            resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, page.getResult());
         }
         List<String> clerkIdList = resultList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
         List<StaffClerkRelationDTO>  relationList = this.staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIdList, wxEnterpriseId) ;