Merge branch 'release' into 'jd_dev'

Release代码合并到jd分支20241224

See merge request !54

yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java

@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -148,7 +149,7 @@ public class BpmTaskController {
                     taskExtMapper.selectListByProcessInstanceId(reqVO.getId());
             if (taskList1 == null || taskList1.size() == 0) continue;
 
-            List<BpmTaskExtDO> taskList = taskList1.stream().filter(t -> t.getAssigneeUserId() == l.getId()).
+            List<BpmTaskExtDO> taskList = taskList1.stream().filter(t -> Objects.equals(t.getAssigneeUserId(),l.getId())).
                     sorted(Comparator.comparingLong(BpmTaskExtDO::getId).reversed()).
                     collect(Collectors.toList());
             if (taskList == null) continue;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -586,7 +586,7 @@ public class OrderDO extends BaseDO {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "收货人信息")
-    @NotNull(message = "收货人信息不能为空")
+//    @NotNull(message = "收货人信息不能为空")
     private OrderConsigneeDO orderConsigneeDO;
 
     @TableField(exist = false)

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/merge/MergeServiceImpl.java

@@ -517,7 +517,9 @@ public class MergeServiceImpl extends AbstractService<MergeMapper, MergeDO> impl
                 orderDO.setOrderNo(newOrderNo);
                 //将几个id设置成空  生成新的收货 发货人和始发 目的信息
                 orderDO.getOrderDepartureDO().setId(null);
+                if (Objects.nonNull(orderDO.getOrderConsigneeDO())) {
                     orderDO.getOrderConsigneeDO().setId(null);
+                }
                 orderDO.getOrderConsignorDO().setId(null);
                 orderDO.getOrderObjectiveDO().setId(null);
                 orderDO.setGuanLianOrderStatus(null);