楚江ERP-订货单变更记录详情调整

@@ -105,15 +105,17 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
 
 
     @Override
     @Override
     public OrderInfoChangeRecord findById(String id) {
     public OrderInfoChangeRecord findById(String id) {
-        OrderInfoChangeRecord changeRecord = getBaseMapper().selectById(id);
+        OrderInfoChangeRecord changeRecord = getBaseMapper().findById(id);
         if (changeRecord == null) {
         if (changeRecord == null) {
             throw new DefaultClientException("订货单变更记录不存在!");
             throw new DefaultClientException("订货单变更记录不存在!");
         }
         }
         // 获取规格数据
         // 获取规格数据
         // 变更前
         // 变更前
         Object obj = redisHandler.get(changeRecord.getOrderId() + "_order_line_info");
         Object obj = redisHandler.get(changeRecord.getOrderId() + "_order_line_info");
-        List<PurchaseOrderLine> beforeChangeList = JsonUtil.parseList(obj.toString(), PurchaseOrderLine.class);
-        changeRecord.setBeforeChangeSpecList(beforeChangeList);
+        if (obj != null) {
+            List<PurchaseOrderLine> beforeChangeList = JsonUtil.parseList(obj.toString(), PurchaseOrderLine.class);
+            changeRecord.setBeforeChangeSpecList(beforeChangeList);
+        }
         // 变更后
         // 变更后
         List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id), true);
         List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id), true);
         if (CollectionUtils.isNotEmpty(afterChangeList)) {
         if (CollectionUtils.isNotEmpty(afterChangeList)) {

@@ -22,4 +22,12 @@ public interface OrderChangeRecordMapper extends BaseMapper<OrderInfoChangeRecor
      * @return      List<OrderSpecificationChangeRecord>
      * @return      List<OrderSpecificationChangeRecord>
      */
      */
     List<OrderInfoChangeRecord> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
     List<OrderInfoChangeRecord> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
+
+    /**
+     * 根据主键ID查询
+     *
+     * @param id    主键ID
+     * @return      OrderInfoChangeRecord
+     */
+    OrderInfoChangeRecord findById(String id);
 }
 }

@@ -118,4 +118,9 @@
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.OrderInfoChangeRecord">
+        <include refid="OrderChangeRecord_sql"/>
+        where tb.id = #{id}
+    </select>
 </mapper>
 </mapper>