兼容收货人限制修改申请审批的历史数据bug

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -497,20 +497,20 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             if (orderApprovalDO.getType() == 61) {
                 msg = result == 4 ? "收货人限制修改申请取消" : "收货人限制修改申请拒绝";
                 ApplyInfoVO applyInfoVO;
-                if (applyVO.getIsLimitUpdateConsignee() != applyVO.getNewIsLimitUpdateConsignee()) {
+                if (orderDO.getIsLimitUpdateConsignee() != applyVO.getNewIsLimitUpdateConsignee()) {
                     applyInfoVO = new ApplyInfoVO();
                     applyInfoVO.setName("是否限制修改收货人");
-                    applyInfoVO.setOrgValue(applyVO.getIsLimitUpdateConsignee() ? "是" : "否");
+                    applyInfoVO.setOrgValue(orderDO.getIsLimitUpdateConsignee() ? "是" : "否");
                     applyInfoVO.setNewValue(applyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
                     list.add(applyInfoVO);
                 }
-                if ((Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay())
-                        && !Objects.equals(applyVO.getLockConsigneeDay(), applyVO.getNewLockConsigneeDay()))
-                        || (Objects.isNull(applyVO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay()))
-                        || (Objects.nonNull(applyVO.getLockConsigneeDay()) && Objects.isNull(applyVO.getNewLockConsigneeDay()))) {
+                if ((Objects.nonNull(orderDO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay())
+                        && !Objects.equals(orderDO.getLockConsigneeDay(), applyVO.getNewLockConsigneeDay()))
+                        || (Objects.isNull(orderDO.getLockConsigneeDay()) && Objects.nonNull(applyVO.getNewLockConsigneeDay()))
+                        || (Objects.nonNull(orderDO.getLockConsigneeDay()) && Objects.isNull(applyVO.getNewLockConsigneeDay()))) {
                     applyInfoVO = new ApplyInfoVO();
                     applyInfoVO.setName("锁定收货人天数");
-                    applyInfoVO.setOrgValue(Objects.isNull(applyVO.getLockConsigneeDay()) ? "空" : applyVO.getLockConsigneeDay() + "天");
+                    applyInfoVO.setOrgValue(Objects.isNull(orderDO.getLockConsigneeDay()) ? "空" : orderDO.getLockConsigneeDay() + "天");
                     applyInfoVO.setNewValue(Objects.isNull(applyVO.getNewLockConsigneeDay()) ? "空" : applyVO.getNewLockConsigneeDay() + "天");
                     list.add(applyInfoVO);
                 }