xuq

src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -23,6 +23,7 @@ import com.gree.mall.manager.plus.service.OrderRefundService;
 import com.gree.mall.manager.plus.service.OrderShareService;
 import com.gree.mall.manager.plus.service.UserService;
 import com.gree.mall.manager.utils.DateUtils;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -212,7 +213,8 @@ public class OrderShareLogic {
         excelData.setName("结算订单");
 
         List<String> statuss = new ArrayList<>();
-        statuss.add(status);
+        if (!StringUtil.isEmpty(status))
+            statuss.add(status);
         List<OrderShare> list = list(request, userId, websitId, orderShareId, orderId, workUserName, phone, statuss, startTime, endTime,
                 startSettleTime, endSettleTime, position, startPayTime, endPayTime, payType,1, -1).getRecords();
 

src/main/resources/mapper/OrderShareReportMapper.xml

@@ -113,7 +113,7 @@
             #{item}
         </foreach>
         group by os.order_share_id
-        order by os.create_time desc ,ot.create_time desc
+        order by os.create_time desc desc
 
     </select>
 </mapper>