diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java
index 5d7fa9d4c..3662385d8 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java
@@ -48,12 +48,11 @@ public class OrderInvoiceRecordController extends BaseController {
 	 */
 	@PreAuthorize("@ss.hasPermi('order:invoice:list')")
 	@GetMapping("/list")
-	public TableDataInfo list(OrderInvoiceRecord orderInvoiceRecord) {
+	public TableDataInfo list(GetInvoiceInfoDTO dto) {
 		startPage();
-		List<OrderInvoiceRecord> list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord);
-		// GetInvoiceInfoDTO dto = new GetInvoiceInfoDTO();
-		// List<OrderInvoiceRecordVO> resultList = orderInvoiceRecordService.getInvoiceListWithAuth(dto);
-		return getDataTable(list);
+		// List<OrderInvoiceRecord> list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord);
+		List<OrderInvoiceRecordVO> resultList = orderInvoiceRecordService.getInvoiceListWithAuth(dto);
+		return getDataTable(resultList);
 	}
 
 	/**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
index d3637cebf..73243b1d8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
@@ -20,6 +20,8 @@ public class OrderInvoiceRecordVO {
     private String email;
     private String orderCodes;
     private String status;
+    private String createTime;
+    private String uodateTime;
     private BigDecimal totalAmount;
     private BigDecimal totalServiceAmount;
     private BigDecimal totalElecAmount;
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
index 945e1ca42..d49414900 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
@@ -148,21 +148,26 @@
             t1.email as email,
             t1.order_codes as orderCodes,
             t1.STATUS as status,
+            t1.create_time as createTime,
+            t1.update_time as updateTime,
             t1.total_amount as totalAmount,
             t1.total_service_amount as totalServiceAmount,
             t1.total_elec_amount  as totalElecAmount
         FROM
             order_invoice_record t1
                 LEFT JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id  and t1.del_flag = '0'
-        where t2.dept_id in
+        where 1 = 1
+        <if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
+            and t2.dept_id in
         <foreach collection="dto.merchantDeptIds" item="deptId" open="(" separator="," close=")">
             #{deptId,jdbcType=VARCHAR}
         </foreach>
+        </if>
         <if test="dto.memberId != null  and dto.memberId != ''"> and t1.member_id = #{dto.memberId}</if>
         <if test="dto.merchantId != null  and dto.merchantId != ''"> and t1.merchant_id = #{dto.merchantId}</if>
         <if test="dto.orderCodes != null  and dto.orderCodes != ''"> and t1.order_codes like concat('%', #{dto.orderCodes}, '%')</if>
         <if test="dto.status != null  and dto.status != ''"> and t1.status = #{dto.status}</if>
-
+        order by t1.create_time desc
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/order/invoice/index.vue b/jsowell-ui/src/views/order/invoice/index.vue
index 45e514d15..a6bf17441 100644
--- a/jsowell-ui/src/views/order/invoice/index.vue
+++ b/jsowell-ui/src/views/order/invoice/index.vue
@@ -104,6 +104,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="ID" align="center" prop="id" />-->
       <el-table-column label="会员id" align="center" prop="memberId" />
+      <el-table-column label="运营商" align="center" prop="merchantName" />
       <!--<el-table-column label="申请订单编号" align="center" prop="orderCodes" />-->
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
@@ -195,6 +196,7 @@ export default {
     /** 查询申请开票列表 */
     getList() {
       this.loading = true;
+      // console.log("this.queryParams", this.queryParams)
       listInvoice(this.queryParams).then(response => {
         this.invoiceList = response.rows;
         this.total = response.total;