|
@@ -351,7 +351,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
queryWrapper.eq("d.id_number", vo.getIdNumber());
|
|
queryWrapper.eq("d.id_number", vo.getIdNumber());
|
|
|
}
|
|
}
|
|
|
if(StringUtils.isNotEmpty(vo.getName())){
|
|
if(StringUtils.isNotEmpty(vo.getName())){
|
|
|
- queryWrapper.like("d.name", vo.getName());
|
|
|
|
|
|
|
+ queryWrapper.eq("d.name", vo.getName());
|
|
|
}
|
|
}
|
|
|
if(vo.getGoldType() != null){
|
|
if(vo.getGoldType() != null){
|
|
|
queryWrapper.eq("d.gold_type", vo.getGoldType());
|
|
queryWrapper.eq("d.gold_type", vo.getGoldType());
|
|
@@ -365,20 +365,14 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
|
|
|
|
|
if(vo.getCountryId() != null){
|
|
if(vo.getCountryId() != null){
|
|
|
queryWrapper.eq("d.country_id", vo.getCountryId());
|
|
queryWrapper.eq("d.country_id", vo.getCountryId());
|
|
|
- }else if(TokenContext.cureWebUser().getAuthorities().contains("12") && TokenContext.cureWebUser().getAreaId() != null){
|
|
|
|
|
- queryWrapper.eq("d.country_id", TokenContext.cureWebUser().getAreaId());
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(vo.getStreetId() != null){
|
|
if(vo.getStreetId() != null){
|
|
|
queryWrapper.eq("d.street_id", vo.getStreetId());
|
|
queryWrapper.eq("d.street_id", vo.getStreetId());
|
|
|
- }else if(TokenContext.cureWebUser().getAuthorities().contains("10") && TokenContext.cureWebUser().getAreaId() != null){
|
|
|
|
|
- queryWrapper.eq("d.street_id", TokenContext.cureWebUser().getAreaId());
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(vo.getCommunityId() != null){
|
|
if(vo.getCommunityId() != null){
|
|
|
queryWrapper.eq("d.community_id", vo.getCommunityId());
|
|
queryWrapper.eq("d.community_id", vo.getCommunityId());
|
|
|
- }else if(TokenContext.cureWebUser().getAuthorities().contains("9") && TokenContext.cureWebUser().getAreaId() != null){
|
|
|
|
|
- queryWrapper.eq("d.community_id", TokenContext.cureWebUser().getAreaId());
|
|
|
|
|
}
|
|
}
|
|
|
return queryWrapper;
|
|
return queryWrapper;
|
|
|
}
|
|
}
|