提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/PackingBillPdfServiceImpl.java

@@ -156,6 +156,7 @@ public class PackingBillPdfServiceImpl implements IPackingBillPdfService {
         if (CollectionUtils.isEmpty(packingProducts)) {
             return new HashMap<>();
         }
+
         Map<String, List<ShipmentPackingProduct>> map = new HashMap<>();
         // 按照箱子id分组
         Map<String, List<ShipmentPackingProduct>> collect = packingProducts.stream().collect(Collectors.groupingBy(ShipmentPackingProduct::getShipmentPackingId));

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/shipment/mapper/ShipmentPackingProductMapper.xml

@@ -209,7 +209,6 @@
         <where>
             t1.tenant_id = #{tenantId}
             AND t1.batch_code = #{batchCode}
-            AND tepc.purchase_status != '999'
         </where>
         ORDER BY
             t1.create_time ASC

bladex-saas-project/saas-mail/src/main/java/com/fjhx/mail/box/mapper/MailboxMapper.xml

@@ -298,7 +298,7 @@
         <!-- 列表查询条件 -->
         <include refid="listCondition" />
 
-        ORDER BYqaa
+        ORDER BY
             t1.user_id DESC
 
         <!-- 分页 -->