收货人限制修改申请业务参数判断bug修改

Signed-off-by: zhengyi <landuo321@aliyun.com>

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

@@ -532,20 +532,20 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
                         .eq(OrderDO::getOrderId, orderApprovalDO.getOrderId()));
                 msg = "收货人限制修改申请审批通过";
                 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);
                 }
@@ -624,20 +624,20 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             orderApprovalDO.setFormId(formId);
             msg = "收货人限制修改申请";
             ApplyInfoVO applyInfoVO;
-            if (orderCargoControlApplyVO.getIsLimitUpdateConsignee() != orderCargoControlApplyVO.getNewIsLimitUpdateConsignee()) {
+            if (orderDO.getIsLimitUpdateConsignee() != orderCargoControlApplyVO.getNewIsLimitUpdateConsignee()) {
                 applyInfoVO = new ApplyInfoVO();
                 applyInfoVO.setName("是否限制修改收货人");
-                applyInfoVO.setOrgValue(orderCargoControlApplyVO.getIsLimitUpdateConsignee() ? "是" : "否");
+                applyInfoVO.setOrgValue(orderDO.getIsLimitUpdateConsignee() ? "是" : "否");
                 applyInfoVO.setNewValue(orderCargoControlApplyVO.getNewIsLimitUpdateConsignee() ? "是" : "否");
                 list.add(applyInfoVO);
             }
-            if ((Objects.nonNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay())
-                    && !Objects.equals(orderCargoControlApplyVO.getLockConsigneeDay(), orderCargoControlApplyVO.getNewLockConsigneeDay()))
-                    || (Objects.isNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))
-                    || (Objects.nonNull(orderCargoControlApplyVO.getLockConsigneeDay()) && Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))) {
+            if ((Objects.nonNull(orderDO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay())
+                    && !Objects.equals(orderDO.getLockConsigneeDay(), orderCargoControlApplyVO.getNewLockConsigneeDay()))
+                    || (Objects.isNull(orderDO.getLockConsigneeDay()) && Objects.nonNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))
+                    || (Objects.nonNull(orderDO.getLockConsigneeDay()) && Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()))) {
                 applyInfoVO = new ApplyInfoVO();
                 applyInfoVO.setName("锁定收货人天数");
-                applyInfoVO.setOrgValue(Objects.isNull(orderCargoControlApplyVO.getLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getLockConsigneeDay() + "天");
+                applyInfoVO.setOrgValue(Objects.isNull(orderDO.getLockConsigneeDay()) ? "空" : orderDO.getLockConsigneeDay() + "天");
                 applyInfoVO.setNewValue(Objects.isNull(orderCargoControlApplyVO.getNewLockConsigneeDay()) ? "空" : orderCargoControlApplyVO.getNewLockConsigneeDay() + "天");
                 list.add(applyInfoVO);
             }