|
|
|
@@ -206,6 +206,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null); |
|
|
|
wxMerchantDto.setIds(merchantIds); |
|
|
|
} |
|
|
|
if(wxMerchantDto.getIsAdmin() == null){ |
|
|
|
wxMerchantDto.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
PageInfo<WxMerchant> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findListCVo(wxMerchantDto)); |
|
|
|
PageInfo<WxMerchantVo> retPageInfo = new PageInfo<WxMerchantVo>(); |
|
|
|
retPageInfo.setPageNum(pageInfo.getPageNum()); |
|
|
|
@@ -291,7 +294,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Long> findIdList(WxMerchant record) { |
|
|
|
if(record == null){ |
|
|
|
if(record.getIsAdmin() == null){ |
|
|
|
record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
return wxMerchantMapper.findIdList(record); |
|
|
|
|