|
@@ -89,7 +89,7 @@ public class CmsOrderController {
|
|
|
|
|
|
|
|
@GetMapping("/get")
|
|
@GetMapping("/get")
|
|
|
@SaCheckPermission("order:view")
|
|
@SaCheckPermission("order:view")
|
|
|
- public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId) {
|
|
|
|
|
|
|
+ public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (channelId != null) {
|
|
if (channelId != null) {
|
|
|
List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
|
|
List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
|
|
@@ -107,6 +107,13 @@ public class CmsOrderController {
|
|
|
if (StrUtil.isNotBlank(showId)) {
|
|
if (StrUtil.isNotBlank(showId)) {
|
|
|
builder.field(OrderDonBackView::getUserId, userService.getUserIdByShowId(showId));
|
|
builder.field(OrderDonBackView::getUserId, userService.getUserIdByShowId(showId));
|
|
|
}
|
|
}
|
|
|
|
|
+ String conditionSql = StrUtil.EMPTY;
|
|
|
|
|
+ if (acId != null) {
|
|
|
|
|
+ conditionSql += String.format(" o.user_id in (select user_id from corp_user where ac_id = %s)", acId);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StrUtil.isNotBlank(conditionSql)) {
|
|
|
|
|
+ builder.put("condition", conditionSql);
|
|
|
|
|
+ }
|
|
|
SearchResult<OrderDonBackView> search = beanSearcher.search(OrderDonBackView.class, builder.build());
|
|
SearchResult<OrderDonBackView> search = beanSearcher.search(OrderDonBackView.class, builder.build());
|
|
|
search.getDataList().forEach(data -> {
|
|
search.getDataList().forEach(data -> {
|
|
|
if (data.getPopularizeId() != null) {
|
|
if (data.getPopularizeId() != null) {
|