Commit 9153f78b by zhiwj

修改bug

parent aaf17695
......@@ -301,25 +301,15 @@ public class ClerkApiServiceImpl implements ClerkApiService {
return ServiceResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
}
}
// 分组的id
// List<TabStoreGroup> groupList = storeGroupService.listStoreGroupAndChildren(clerkSearchDTO.getStoreGroupId());
// List<Integer> groupIds = groupList.stream().map(TabStoreGroup::getStoreGroupId).collect(Collectors.toList());
// // 查询条件对应的storeId
// String storeIdByClerkSearch;
// if (StringUtils.isNotBlank(clerkSearchDTO.getSearch())) {
// List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId, clerkSearchDTO.getSearch());
// if (CollectionUtils.isEmpty(groupIds) || CollectionUtils.isEmpty(storeInfoIdsBySearch)) {
// return ServiceResponse.success(new Page<>());
// } else {
// storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, null);
// }
// } else {
// storeIdByClerkSearch = "";
// }
// clerkSearchDTO.setEnterpriseId(enterpriseId);
// if (!hasStoreIds) {
// clerkSearchDTO.setStoreIds(storeIdByClerkSearch);
// }
if (StringUtils.isNotBlank(clerkSearchDTO.getSearch())) {
List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId, clerkSearchDTO.getSearch());
if (CollectionUtils.isNotEmpty(storeInfoIdsBySearch)) {
String storeInfoIds = storeInfoIdsBySearch.stream().map(Object::toString).collect(Collectors.joining(" "));
clerkSearchDTO.setStoreIds(storeInfoIds);
}
}
ServiceResponse<Page<StoreDTO>> serviceResponse = listStoreIds(clerkSearchDTO, pageNum, pageSize);
if (!serviceResponse.isSuccess()) {
return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment