sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:默认新增订单的发起者为操作人之一

Browse Source
This commit is contained in:
chenxiky 2025-07-26 18:29:41 +08:00
parent e63d51c064
commit 1a8eba26a6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
View File

@ -552,6 +552,12 @@ public class OrderBiz {
* @return {@link List<OrderOperator>} * @return {@link List<OrderOperator>}
*/ */
private List<OrderOperator> buildOrderOperatorParam(List<Long> operatorIds, Long orderId) { private List<OrderOperator> buildOrderOperatorParam(List<Long> operatorIds, Long orderId) {
// 获取当前登录人ID
Long currentOperatorId = SecurityUtils.getCurrentUserId();
// 如果操作人不包含在 operatorIds则添加当前登录人ID（默认添加任务发起者为操作人）
if (!operatorIds.contains(currentOperatorId)) {
operatorIds.add(currentOperatorId);
}
List<OrderOperator> orderOperatorList = new ArrayList<>(); List<OrderOperator> orderOperatorList = new ArrayList<>();
for (Long operatorId : operatorIds) { for (Long operatorId : operatorIds) {
OrderOperator orderOperator = new OrderOperator(); OrderOperator orderOperator = new OrderOperator();

5
aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderDTO.java
View File

@ -68,6 +68,7 @@ public class AddOrderDTO {
/** /**
* 额外费用 * 额外费用
*/ */
@NotNull
@ApiModelProperty(value = "额外费用", required = true) @ApiModelProperty(value = "额外费用", required = true)
@DecimalMin(value = "0", message = "额外费用不能小于0") @DecimalMin(value = "0", message = "额外费用不能小于0")
private BigDecimal surchargeAmount; private BigDecimal surchargeAmount;
@ -75,8 +76,8 @@ public class AddOrderDTO {
/** /**
* 操作人集合ID * 操作人集合ID
*/ */
@NotNull(message = "操作人集合ID不能为空") @NotNull
@NotEmpty @NotEmpty(message = "操作人集合ID不能为空")
@ApiModelProperty(value = "操作人集合ID", required = true) @ApiModelProperty(value = "操作人集合ID", required = true)
private List<Long> operatorIds; private List<Long> operatorIds;