cup 3 роки тому
батько
коміт
5503ffa821

+ 7 - 2
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserTicketOrderMgrController.java

@@ -46,6 +46,7 @@ public class UserTicketOrderMgrController extends BaseApiController {
     private IUserTicketOrderService userTicketOrderService;
 
     @PostMapping("/list")
+    @PreAuthorize("@ss.hasPermi('order:userTicket:list')")
     @ApiOperation("用户盲票订单列表")
     @ApiResponses(
             @ApiResponse(code = 200, message = "成功", response = UserTicketOrderListVO.class)
@@ -72,6 +73,7 @@ public class UserTicketOrderMgrController extends BaseApiController {
     }
 
     @PostMapping("/detail/{orderId}")
+    @PreAuthorize("@ss.hasPermi('order:userTicket:query')")
     @ApiOperation("用户盲票订单详情")
     @ApiResponses(
             @ApiResponse(code = 200, message = "成功", response = UserTicketOrderDetailVO.class)
@@ -81,8 +83,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
         return AjaxResult.success(userTicketOrderService.detail(orderId));
     }
 
-//    @Log(title = "用户订单导出", businessType = BusinessType.EXPORT)
+    @Log(title = "用户订单导出", businessType = BusinessType.EXPORT)
     @PostMapping("export")
+    @PreAuthorize("@ss.hasPermi('order:userTicket:export')")
     @ApiOperation("用户订单导出")
     public AjaxResult export(@RequestBody UserTicketOrderQueryParam userTicketOrderQueryParam) {
         QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
@@ -120,7 +123,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
         List<UserTicketOrderExcel> excelList = userTicketOrderListVOList.stream().map(userTicketOrderListVO -> {
             UserTicketOrderExcel userTicketOrderExcel = new UserTicketOrderExcel();
             BeanUtils.copyProperties(userTicketOrderListVO, userTicketOrderExcel);
-            userTicketOrderExcel.setBoxType(userTicketOrderListVO.getBoxType().getDesc());
+            if (Objects.nonNull(userTicketOrderListVO.getBoxType())){
+                userTicketOrderExcel.setBoxType(userTicketOrderListVO.getBoxType().getDesc());
+            }
             return userTicketOrderExcel;
         }).collect(Collectors.toList());