feat(order): 实现订单分配功能并重构系统架构

- 添加订单分配记录相关实体、服务和控制器
- 实现订单拆分分配和平台分配功能
- 重构部门服务调用，使用SysDept替换ComDept
- 优化订单查询和分配流程，支持按时间范围筛选
- 添加订单分配状态和拆单状态字段
- 实现订单分配记录的增删改查功能
- 调整数据权限范围配置，优化部门数据访问
- 添加订单产品分配状态跟踪功能
- 实现平台数据隔离和订单审核流程

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java

@@ -4,6 +4,8 @@ import cn.hutool.core.lang.tree.Tree;
 import org.dromara.system.api.domain.vo.RemoteDeptVo;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 部门服务
@@ -59,4 +61,6 @@ public interface RemoteDeptService {
      */
     List<Tree<Long>> buildDeptTreeSelect(List<RemoteDeptVo> depts);
 
+    Map<Long, String> selectDeptNameByIds(Set<Long> ids);
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/OrderAssignStatus.java

@@ -0,0 +1,27 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户状态
+ *
+ * @author ruoyi
+ */
+@Getter
+@AllArgsConstructor
+public enum OrderAssignStatus {
+    /**
+     * 待分配
+     */
+    WAIT_ASSIGN("0", "待分配"),
+    /**
+     * 已分配
+     */
+    ASSIGNED("1", "已分配");
+
+
+    private final String code;
+    private final String info;
+
+}

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlatformDataScopeInterceptor.java

@@ -43,8 +43,8 @@ public class PlatformDataScopeInterceptor implements Interceptor {
         "sys_post",
         "sys_user_post",
         "sys_config",
-        "sys_dict",
         "sys_dept",
+        "sys_dict",
         "sys_dict_type",
         "sys_dict_data",
         "sys_oss",

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java

@@ -8,8 +8,15 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.redisson.api.RIdGenerator;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 发号器工具类
@@ -178,18 +185,22 @@ public class SequenceUtils {
     }
 
     public static String generateOrderCode(String prefix) {
-        // 构建带日期的 key，确保每天重置流水号
-        String dateKey = DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER);
-        String businessKey = prefix + dateKey;
+        // 明确指定 bean name 为 "redisTemplate"
+        RedisTemplate<String, Object> redisTemplate = SpringUtils.getBean("redisTemplate", RedisTemplate.class);
 
-        // 每天过期，保证每天从 0001 开始
-        Duration expireTime = Duration.ofDays(1);
+        String dateKey = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN); // 如 "yyyyMMdd"
+        String businessKey = prefix + dateKey;
 
-        // 获取补零后的4位流水号
-        String paddedSeq = SequenceUtils.nextPaddedIdStr(businessKey, expireTime, 4);
+        Long seq = redisTemplate.opsForValue().increment(businessKey);
+        if (seq == 1L) {
+            long secondsUntilEndOfDay = LocalDateTime.now().until(
+                LocalDate.now().plusDays(1).atStartOfDay(),
+                ChronoUnit.SECONDS
+            );
+            redisTemplate.expire(businessKey, secondsUntilEndOfDay, TimeUnit.SECONDS);
+        }
 
-        // 拼接最终单号
-        return businessKey + paddedSeq;
+        return businessKey + String.format("%04d", seq);
     }
 
     /*生成20位发货单号方法*/

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerInfoServiceImpl.java

@@ -123,7 +123,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
         Map<Long, String> deptMap = deptIds.isEmpty()
             ? Collections.emptyMap()
-            : remoteComDeptService.selectDeptNameByIds(deptIds);
+            : remoteDeptService.selectDeptNameByIds(deptIds);
 
         // 先转换
         CustomerSalesInfoVo voObj = MapstructUtils.convert(customerSalesInfo, CustomerSalesInfoVo.class);
@@ -249,7 +249,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
         Map<Long, String> deptMap = deptIds.isEmpty()
             ? Collections.emptyMap()
-            : remoteComDeptService.selectDeptNameByIds(deptIds);
+            : remoteDeptService.selectDeptNameByIds(deptIds);
 
         // === 6. 回填人员和部门名称到 salesInfoVo ===
         for (CustomerSalesInfoVo vo : salesInfoVos) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderAssignmentController.java

@@ -0,0 +1,119 @@
+package org.dromara.order.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.order.domain.bo.OrderSplitAssignBo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.order.domain.vo.OrderAssignmentVo;
+import org.dromara.order.domain.bo.OrderAssignmentBo;
+import org.dromara.order.service.IOrderAssignmentService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 订单分配记录
+ * 前端访问路由地址为:/order/orderAssignment
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/orderAssignment")
+public class OrderAssignmentController extends BaseController {
+
+    private final IOrderAssignmentService orderAssignmentService;
+
+    /**
+     * 查询订单分配记录列表
+     */
+//    @SaCheckPermission("order:orderAssignment:list")
+    @GetMapping("/list")
+    public TableDataInfo<OrderAssignmentVo> list(OrderAssignmentBo bo, PageQuery pageQuery) {
+        return orderAssignmentService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出订单分配记录列表
+     */
+//    @SaCheckPermission("order:orderAssignment:export")
+    @Log(title = "订单分配记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OrderAssignmentBo bo, HttpServletResponse response) {
+        List<OrderAssignmentVo> list = orderAssignmentService.queryList(bo);
+        ExcelUtil.exportExcel(list, "订单分配记录", OrderAssignmentVo.class, response);
+    }
+
+    /**
+     * 获取订单分配记录详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("order:orderAssignment:query")
+    @GetMapping("/{id}")
+    public R<OrderAssignmentVo> getInfo(@NotNull(message = "主键不能为空")
+                                        @PathVariable("id") Long id) {
+        return R.ok(orderAssignmentService.queryById(id));
+    }
+
+    /**
+     * 新增订单分配记录
+     */
+//    @SaCheckPermission("order:orderAssignment:add")
+    @Log(title = "订单分配记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderAssignmentBo bo) {
+        return toAjax(orderAssignmentService.insertByBo(bo));
+    }
+
+
+    /**
+     * 新增订单分配记录------拆单
+     */
+//    @SaCheckPermission("order:orderAssignment:add")
+    @Log(title = "订单分配记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/splitAssign")
+    public R<Void> splitAssign(@Validated(AddGroup.class) @RequestBody OrderSplitAssignBo bo) {
+        return toAjax(orderAssignmentService.splitAssign(bo));
+    }
+
+    /**
+     * 修改订单分配记录
+     */
+//    @SaCheckPermission("order:orderAssignment:edit")
+    @Log(title = "订单分配记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderAssignmentBo bo) {
+        return toAjax(orderAssignmentService.updateByBo(bo));
+    }
+
+    /**
+     * 删除订单分配记录
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("order:orderAssignment:remove")
+    @Log(title = "订单分配记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(orderAssignmentService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderMainController.java

@@ -13,6 +13,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.tenant.helper.PlatformHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.vo.OrderMainVo;
@@ -46,6 +47,14 @@ public class OrderMainController extends BaseController {
         return orderMainService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询分配订单列表
+     */
+    @GetMapping("/assignmentList")
+    public TableDataInfo<OrderMainVo> assignmentList(OrderMainBo bo, PageQuery pageQuery) {
+        return PlatformHelper.ignore(() -> orderMainService.queryPageList(bo, pageQuery));
+    }
+
     /**
      * 查询订单状态数量
      */
@@ -119,4 +128,13 @@ public class OrderMainController extends BaseController {
     public R<Void> changeStatus(@RequestBody OrderMainBo bo) {
         return toAjax(orderMainService.updateStatus(bo));
     }
+
+    /**
+     * 订单审核
+     */
+    @Log(title = "订单主信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/checkStatus")
+    public R<Void> checkStatus(@RequestBody OrderMainBo bo) {
+        return toAjax(orderMainService.updateCheckStatus(bo));
+    }
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderAssignment.java

@@ -0,0 +1,83 @@
+package org.dromara.order.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 订单分配记录对象 order_assignment
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("order_assignment")
+public class OrderAssignment extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 订单ID，关联订单表
+     */
+    private Long orderId;
+
+    private String orderNo;
+
+    /**
+     * 分配前平台
+     */
+    private String platformBefore;
+
+    /**
+     * 分配后平台
+     */
+    private String platformAfter;
+
+    /**
+     * 分配人
+     */
+    private Long assignedBy;
+
+    /**
+     * 分配时间
+     */
+    private Date assignTime;
+
+    /**
+     * 分配类型：手动/自动
+     */
+    private String assignType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 分配原因
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderProduct.java

@@ -159,5 +159,7 @@ public class OrderProduct extends TenantEntity {
      */
     private String remark;
 
+    private String assignmentStatus;
+
 
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderProductAssignRule.java

@@ -0,0 +1,13 @@
+package org.dromara.order.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderProductAssignRule implements Serializable {
+
+    private Long itemId;          // order_product.id
+
+    private String targetPlatform; // 目标平台
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderAssignmentBo.java

@@ -0,0 +1,78 @@
+package org.dromara.order.domain.bo;
+
+import org.dromara.order.domain.OrderAssignment;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 订单分配记录业务对象 order_assignment
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = OrderAssignment.class, reverseConvertGenerate = false)
+public class OrderAssignmentBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 订单ID，关联订单表
+     */
+    private Long orderId;
+
+    private String orderNo;
+
+    /**
+     * 分配前平台
+     */
+    private String platformBefore;
+
+    /**
+     * 分配后平台
+     */
+    @NotBlank(message = "分配后平台不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String platformAfter;
+
+    /**
+     * 分配人
+     */
+    private Long assignedBy;
+
+    /**
+     * 分配时间
+     */
+    private Date assignTime;
+
+    /**
+     * 分配类型：手动/自动
+     */
+    private String assignType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    private String orderIds;
+
+    /**
+     * 分配原因
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderMainBo.java

@@ -189,12 +189,12 @@ public class OrderMainBo extends BaseEntity {
     /**
      * 拆单状态：0=未拆, 1=已拆出子单
      */
-    private Long splitStatus;
+    private String splitStatus;
 
     /**
      * 是否为拆分子单：0=是, 1=否
      */
-    private Long isSplitChild;
+    private String isSplitChild;
 
     /**
      * 包裹数量

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderProductBo.java

@@ -147,6 +147,8 @@ public class OrderProductBo extends BaseEntity {
 
     private String dataSource;
 
+    private String assignmentStatus;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderAssignmentVo.java

@@ -0,0 +1,91 @@
+package org.dromara.order.domain.vo;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.order.domain.OrderAssignment;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 订单分配记录视图对象 order_assignment
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = OrderAssignment.class)
+public class OrderAssignmentVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 订单ID，关联订单表
+     */
+    @ExcelProperty(value = "订单ID，关联订单表")
+    private Long orderId;
+
+    private String orderNo;
+
+    /**
+     * 分配前平台
+     */
+    @ExcelProperty(value = "分配前平台")
+    private String platformBefore;
+
+    /**
+     * 分配后平台
+     */
+    @ExcelProperty(value = "分配后平台")
+    private String platformAfter;
+
+    /**
+     * 分配人
+     */
+    @ExcelProperty(value = "分配人")
+    private Long assignedBy;
+
+    /**
+     * 分配时间
+     */
+    @ExcelProperty(value = "分配时间")
+    private Date assignTime;
+
+    /**
+     * 分配类型：手动/自动
+     */
+    @ExcelProperty(value = "分配类型：手动/自动")
+    private String assignType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 分配原因
+     */
+    @ExcelProperty(value = "分配原因")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderProductVo.java

@@ -191,6 +191,11 @@ public class OrderProductVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+
+    private String platformCode;
+
+    private String assignmentStatus;
+
     private String dataSource;
 
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderAssignmentMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.order.mapper;
+
+import org.dromara.order.domain.OrderAssignment;
+import org.dromara.order.domain.vo.OrderAssignmentVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 订单分配记录Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+public interface OrderAssignmentMapper extends BaseMapperPlus<OrderAssignment, OrderAssignmentVo> {
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderProductMapper.java

@@ -19,4 +19,17 @@ public interface OrderProductMapper extends BaseMapperPlus<OrderProduct, OrderPr
     List<OrderProductVo> selectProductsWithDelivered(@Param("orderId") Long orderId);
 
     OrderQuantitySummary selectOrderAndDeliveredQuantity(@Param("orderId") Long orderId);
+
+    void updatePlatformAndStatusByOrderIds(
+        @Param("orderIds") List<Long> orderIds,
+        @Param("platformCode") String platformCode,
+        @Param("assignmentStatus") String assignmentStatus
+    );
+
+    void updateForSplitAssign(
+        @Param("itemIds") List<Long> itemIds,
+        @Param("newOrderId") Long newOrderId,
+        @Param("platformCode") String platformCode,
+        @Param("assignmentStatus") String assignmentStatus
+    );
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderAssignmentService.java

@@ -0,0 +1,73 @@
+package org.dromara.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.order.domain.OrderAssignment;
+import org.dromara.order.domain.bo.OrderSplitAssignBo;
+import org.dromara.order.domain.vo.OrderAssignmentVo;
+import org.dromara.order.domain.bo.OrderAssignmentBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单分配记录Service接口
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+public interface IOrderAssignmentService extends IService<OrderAssignment> {
+
+    /**
+     * 查询订单分配记录
+     *
+     * @param id 主键
+     * @return 订单分配记录
+     */
+    OrderAssignmentVo queryById(Long id);
+
+    /**
+     * 分页查询订单分配记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 订单分配记录分页列表
+     */
+    TableDataInfo<OrderAssignmentVo> queryPageList(OrderAssignmentBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的订单分配记录列表
+     *
+     * @param bo 查询条件
+     * @return 订单分配记录列表
+     */
+    List<OrderAssignmentVo> queryList(OrderAssignmentBo bo);
+
+    /**
+     * 新增订单分配记录
+     *
+     * @param bo 订单分配记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(OrderAssignmentBo bo);
+
+    Boolean splitAssign(OrderSplitAssignBo bo);
+
+    /**
+     * 修改订单分配记录
+     *
+     * @param bo 订单分配记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(OrderAssignmentBo bo);
+
+    /**
+     * 校验并批量删除订单分配记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderAssignmentServiceImpl.java

@@ -0,0 +1,373 @@
+package org.dromara.order.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.context.PlatformContext;
+import org.dromara.common.core.enums.OrderAssignStatus;
+import org.dromara.common.core.enums.OrderSplitStatus;
+import org.dromara.common.core.enums.SysPlatformCode;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.PlatformContextUtil;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.SequenceUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.order.domain.OrderAssignment;
+import org.dromara.order.domain.OrderMain;
+import org.dromara.order.domain.OrderProduct;
+import org.dromara.order.domain.OrderProductAssignRule;
+import org.dromara.order.domain.bo.OrderAssignmentBo;
+import org.dromara.order.domain.bo.OrderSplitAssignBo;
+import org.dromara.order.domain.vo.OrderAssignmentVo;
+import org.dromara.order.domain.vo.OrderMainVo;
+import org.dromara.order.mapper.OrderAssignmentMapper;
+import org.dromara.order.mapper.OrderMainMapper;
+import org.dromara.order.mapper.OrderProductMapper;
+import org.dromara.order.service.IOrderAssignmentService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 订单分配记录Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-01-07
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMapper, OrderAssignment> implements IOrderAssignmentService {
+
+    private static final String CHILD_ORDER_NO_KEY = "order_main:child_order_no";
+
+    private final OrderAssignmentMapper baseMapper;
+
+    private final OrderMainMapper orderMainMapper;
+
+    private final OrderProductMapper orderProductMapper;
+
+    /**
+     * 查询订单分配记录
+     *
+     * @param id 主键
+     * @return 订单分配记录
+     */
+    @Override
+    public OrderAssignmentVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询订单分配记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 订单分配记录分页列表
+     */
+    @Override
+    public TableDataInfo<OrderAssignmentVo> queryPageList(OrderAssignmentBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<OrderAssignment> lqw = buildQueryWrapper(bo);
+        Page<OrderAssignmentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的订单分配记录列表
+     *
+     * @param bo 查询条件
+     * @return 订单分配记录列表
+     */
+    @Override
+    public List<OrderAssignmentVo> queryList(OrderAssignmentBo bo) {
+        LambdaQueryWrapper<OrderAssignment> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<OrderAssignment> buildQueryWrapper(OrderAssignmentBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OrderAssignment> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(OrderAssignment::getId);
+        lqw.eq(bo.getOrderId() != null, OrderAssignment::getOrderId, bo.getOrderId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformBefore()), OrderAssignment::getPlatformBefore, bo.getPlatformBefore());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformAfter()), OrderAssignment::getPlatformAfter, bo.getPlatformAfter());
+        lqw.eq(bo.getAssignedBy() != null, OrderAssignment::getAssignedBy, bo.getAssignedBy());
+        lqw.eq(StringUtils.isNotBlank(bo.getAssignType()), OrderAssignment::getAssignType, bo.getAssignType());
+        if (params != null) {
+            lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                OrderAssignment::getAssignTime, params.get("beginTime"), params.get("endTime"));
+        }
+        return lqw;
+    }
+
+    /**
+     * 新增订单分配记录
+     *
+     * @param bo 订单分配记录
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(OrderAssignmentBo bo) {
+        Date now = new Date();
+        Long operatorId = LoginHelper.getUserId();
+
+        // 1. 解析订单ID列表
+        List<Long> orderIdList = parseOrderIds(bo.getOrderIds());
+
+        // 2. 查询原始订单信息
+        List<OrderMainVo> orderVos = orderMainMapper.selectVoByIds(orderIdList);
+        Map<Long, String> orderIdToPlatformBefore = orderVos.stream()
+            .collect(Collectors.toMap(OrderMainVo::getId, OrderMainVo::getPlatformCode));
+        Map<Long, String> orderNoToMap = orderVos.stream()
+            .collect(Collectors.toMap(OrderMainVo::getId, OrderMainVo::getOrderNo));
+
+        // 3. 准备分配记录 & 主订单更新对象
+        List<OrderAssignment> assignmentsToInsert = new ArrayList<>();
+        List<OrderMain> ordersToUpdate = new ArrayList<>();
+
+        for (Long orderId : orderIdList) {
+            OrderAssignment assignment = buildAssignment(bo, orderId, orderNoToMap, orderIdToPlatformBefore, operatorId, now);
+            validEntityBeforeSave(assignment);
+            assignmentsToInsert.add(assignment);
+
+            OrderMain orderMain = new OrderMain();
+            orderMain.setId(orderId);
+            orderMain.setPlatformCode(bo.getPlatformAfter());
+            orderMain.setAssignmentStatus(OrderAssignStatus.ASSIGNED.getCode());
+            ordersToUpdate.add(orderMain);
+        }
+
+        // 4. 批量插入分配记录
+        boolean insertSuccess = !assignmentsToInsert.isEmpty() && baseMapper.insertBatch(assignmentsToInsert);
+        if (!insertSuccess) {
+            log.error("订单分配记录插入失败");
+            throw new ServiceException("订单分配记录插入失败");
+        }
+
+        // 5. 批量更新订单商品表：设置 platform_code 和 assignment_status
+        if (!orderIdList.isEmpty()) {
+            orderProductMapper.updatePlatformAndStatusByOrderIds(
+                orderIdList,
+                bo.getPlatformAfter(),
+                OrderAssignStatus.ASSIGNED.getCode()
+            );
+        }
+
+        // 6. 批量更新订单主表（在目标平台上下文中执行）
+        String targetPlatform = bo.getPlatformAfter();
+        String currentPlatform = PlatformContext.getPlatform();
+        if (StringUtils.isEmpty(currentPlatform)) {
+            currentPlatform = SysPlatformCode.OMS.getCode();
+        }
+
+        if (SysPlatformCode.OMS.getCode().equals(currentPlatform)) {
+            PlatformContextUtil.executeWithPlatform(targetPlatform, () -> {
+                for (OrderMain order : ordersToUpdate) {
+                    orderMainMapper.updateById(order);
+                }
+                return null;
+            });
+        } else {
+            // 如果已在目标平台上下文，直接更新
+            for (OrderMain order : ordersToUpdate) {
+                orderMainMapper.updateById(order);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean splitAssign(OrderSplitAssignBo bo) {
+        Long parentId = bo.getOrderId();
+        List<OrderProductAssignRule> rules = bo.getItemRules();
+
+        if (CollUtil.isEmpty(rules)) {
+            throw new ServiceException("未选择任何商品进行分配");
+        }
+
+        Date now = new Date();
+        Long operatorId = LoginHelper.getUserId();
+
+        // 1. 查询父订单
+        OrderMain parentOrder = orderMainMapper.selectById(parentId);
+        if (parentOrder == null) {
+            throw new ServiceException("父订单不存在");
+        }
+        if (OrderSplitStatus.SPLITED.getCode().equals(parentOrder.getSplitStatus())) {
+            throw new ServiceException("该订单已被拆分，不可重复操作");
+        }
+
+        // 2. 查询所有待分配的商品行（验证存在性 & 所属订单）
+        List<Long> itemIds = rules.stream().map(OrderProductAssignRule::getItemId).collect(Collectors.toList());
+        List<OrderProduct> items = orderProductMapper.selectBatchIds(itemIds);
+        Map<Long, OrderProduct> itemMap = items.stream()
+            .collect(Collectors.toMap(OrderProduct::getId, Function.identity()));
+
+        // 验证：所有商品属于该父订单，且未分配
+        for (OrderProductAssignRule rule : rules) {
+            OrderProduct item = itemMap.get(rule.getItemId());
+            if (item == null || !parentId.equals(item.getOrderId())) {
+                throw new ServiceException("商品行不属于该订单或不存在");
+            }
+            if (OrderAssignStatus.ASSIGNED.getCode().equals(item.getAssignmentStatus())) {
+                throw new ServiceException("商品 [" + item.getProductName() + "] 已分配，不可重复操作");
+            }
+        }
+
+        // 3. 按目标平台分组
+        Map<String, List<OrderProductAssignRule>> platformToRules = rules.stream()
+            .collect(Collectors.groupingBy(OrderProductAssignRule::getTargetPlatform));
+        OrderMain childOrder = null;
+        // 4. 为每个平台创建子订单，并迁移商品
+        for (Map.Entry<String, List<OrderProductAssignRule>> entry : platformToRules.entrySet()) {
+            String targetPlatform = entry.getKey();
+            List<OrderProductAssignRule> groupRules = entry.getValue();
+            childOrder = copyParentToChild(parentOrder, targetPlatform);
+            orderMainMapper.insert(childOrder);
+
+            // 迁移商品行：更新 orderId + platform_code + assignment_status
+            List<Long> groupItemIds = groupRules.stream().map(OrderProductAssignRule::getItemId).collect(Collectors.toList());
+            orderProductMapper.updateForSplitAssign(
+                groupItemIds,
+                childOrder.getId(),
+                targetPlatform,
+                OrderAssignStatus.ASSIGNED.getCode()
+            );
+
+            // 插入分配记录（子订单维度）
+            OrderAssignment assignment = new OrderAssignment();
+            assignment.setOrderId(childOrder.getId());
+            assignment.setOrderNo(childOrder.getOrderNo());
+            assignment.setPlatformBefore(parentOrder.getPlatformCode());
+            assignment.setPlatformAfter(targetPlatform);
+            assignment.setAssignedBy(operatorId);
+            assignment.setAssignTime(now);
+            assignment.setAssignType("0"); // 拆单类型
+            assignment.setRemark(bo.getRemark());
+            baseMapper.insert(assignment);
+        }
+
+        // 5. 更新父订单状态：标记为已拆分
+        OrderMain updateParent = new OrderMain();
+        updateParent.setId(parentId);
+        updateParent.setAssignmentStatus(OrderAssignStatus.ASSIGNED.getCode());
+        updateParent.setSplitStatus(OrderSplitStatus.SPLITED.getCode()); // 已拆分
+        // 注意：父订单 platformCode 保持不变（作为入口）
+        orderMainMapper.updateById(updateParent);
+
+        return true;
+    }
+
+
+    private List<Long> parseOrderIds(String orderIdsStr) {
+        if (StringUtils.contains(orderIdsStr, ",")) {
+            return Arrays.stream(orderIdsStr.split(","))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .map(Long::parseLong)
+                .collect(Collectors.toList());
+        } else {
+            return Collections.singletonList(Long.valueOf(orderIdsStr));
+        }
+    }
+
+    private OrderAssignment buildAssignment(OrderAssignmentBo bo, Long orderId,
+                                            Map<Long, String> orderNoMap, Map<Long, String> platformBeforeMap,
+                                            Long operatorId, Date now) {
+        OrderAssignment assignment = new OrderAssignment();
+        assignment.setOrderId(orderId);
+        assignment.setOrderNo(orderNoMap.getOrDefault(orderId, ""));
+        assignment.setPlatformBefore(platformBeforeMap.getOrDefault(orderId, ""));
+        assignment.setPlatformAfter(bo.getPlatformAfter());
+        assignment.setAssignedBy(operatorId);
+        assignment.setAssignTime(now);
+        assignment.setAssignType(bo.getAssignType());
+        assignment.setRemark(bo.getRemark());
+        return assignment;
+    }
+
+
+    private OrderMain copyParentToChild(OrderMain parent, String targetPlatform) {
+        OrderMain child = new OrderMain();
+        String childSeqKey = "child_order_seq:" + parent.getOrderNo();
+        String paddedSeq = SequenceUtils.nextPaddedIdStr(childSeqKey, Duration.ofDays(90), 2);
+        child.setParentOrderId(parent.getId());
+        child.setIsSplitChild("0");
+        child.setPlatformCode(targetPlatform);
+        child.setOrderNo(parent.getOrderNo() + paddedSeq);
+        child.setCompanyId(parent.getCompanyId());
+        child.setCustomerId(parent.getCustomerId());
+        child.setExpectedDeliveryTime(parent.getExpectedDeliveryTime());
+        child.setShippingAddressId(parent.getShippingAddressId());
+        child.setWarehouseId(parent.getWarehouseId());
+        child.setInvoiceType(parent.getInvoiceType());
+        child.setPayType(parent.getPayType());
+        child.setTotalAmount(parent.getTotalAmount());
+        child.setPayableAmount(parent.getPayableAmount());
+        child.setShippingFee(parent.getShippingFee());
+        child.setOrderSource(parent.getOrderSource());
+        child.setBusinessStaff(parent.getBusinessStaff());
+        child.setBusinessDept(parent.getBusinessDept());
+        child.setPurchaseReason(parent.getPurchaseReason());
+        child.setCreditLimit(parent.getCreditLimit());
+        child.setOrderStatus(parent.getOrderStatus());
+        child.setAssignmentStatus(OrderAssignStatus.ASSIGNED.getCode());
+        child.setSplitStatus("0");
+        child.setRemark(parent.getRemark());
+        child.setCheckStatus(parent.getCheckStatus());
+        child.setCreateTime(new Date());
+        child.setUpdateTime(new Date());
+        child.setDataSource(parent.getDataSource());
+        child.setDeliveryType(parent.getDeliveryType());
+        return child;
+    }
+
+    /**
+     * 修改订单分配记录
+     *
+     * @param bo 订单分配记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(OrderAssignmentBo bo) {
+        OrderAssignment update = MapstructUtils.convert(bo, OrderAssignment.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(OrderAssignment entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除订单分配记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderDeliverServiceImpl.java

@@ -111,6 +111,8 @@ public class OrderDeliverServiceImpl extends ServiceImpl<OrderDeliverMapper, Ord
         lqw.eq(StringUtils.isNotBlank(bo.getLogisticPackStatus()), OrderDeliver::getLogisticPackStatus, bo.getLogisticPackStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getConsigneePhone()), OrderDeliver::getConsigneePhone, bo.getConsigneePhone());
         lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), OrderDeliver::getPlatformCode, bo.getPlatformCode());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+            OrderDeliver::getCreateTime, params.get("beginTime"), params.get("endTime"));
         return lqw;
     }
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -127,6 +127,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         lqw.eq(StringUtils.isNotBlank(bo.getCustomerCode()), OrderMain::getCustomerCode, bo.getCustomerCode());
         lqw.eq(StringUtils.isNotBlank(bo.getShipmentNo()), OrderMain::getShipmentNo, bo.getShipmentNo());
         lqw.eq(StringUtils.isNotBlank(bo.getSubOrderNo()), OrderMain::getSubOrderNo, bo.getSubOrderNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsSplitChild()), OrderMain::getIsSplitChild, bo.getIsSplitChild());
         lqw.eq(bo.getCompanyId() != null, OrderMain::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getCustomerId() != null, OrderMain::getCustomerId, bo.getCustomerId());
         lqw.eq(bo.getUserId() != null, OrderMain::getUserId, bo.getUserId());

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderReturnServiceImpl.java

@@ -21,6 +21,7 @@ import org.dromara.order.domain.vo.OrderReturnVo;
 import org.dromara.order.mapper.OrderReturnItemMapper;
 import org.dromara.order.mapper.OrderReturnMapper;
 import org.dromara.order.service.IOrderReturnService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderRevenueHeaderServiceImpl.java

@@ -14,10 +14,8 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.SequenceUtils;
 import org.dromara.customer.api.RemoteCustomerService;
-import org.dromara.order.domain.OrderDeliverProduct;
 import org.dromara.order.domain.OrderRevenueDetail;
 import org.dromara.order.domain.OrderRevenueHeader;
-import org.dromara.order.domain.bo.OrderDeliverProductBo;
 import org.dromara.order.domain.bo.OrderRevenueDetailBo;
 import org.dromara.order.domain.bo.OrderRevenueHeaderBo;
 import org.dromara.order.domain.vo.OrderRevenueDetailVo;
@@ -29,7 +27,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderAssignmentMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.order.mapper.OrderAssignmentMapper">
+
+</mapper>

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderProductMapper.xml

@@ -50,4 +50,27 @@
           AND op.del_flag = '0'
     </select>
 
+    <update id="updatePlatformAndStatusByOrderIds">
+        UPDATE order_product
+        SET
+        platform_code = #{platformCode},
+        assignment_status = #{assignmentStatus}
+        WHERE order_id IN
+        <foreach collection="orderIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="updateForSplitAssign">
+        UPDATE order_product
+        SET
+        order_id = #{newOrderId},
+        platform_code = #{platformCode},
+        assignment_status = #{assignmentStatus}
+        WHERE id IN
+        <foreach collection="itemIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java

@@ -12,6 +12,8 @@ import org.dromara.system.service.ISysDeptService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 部门服务
@@ -99,4 +101,9 @@ public class RemoteDeptServiceImpl implements RemoteDeptService {
         SysDeptVo sysDeptVo = sysDeptService.selectDeptById(deptId);
         return BeanUtil.copyProperties(sysDeptVo, RemoteDeptVo.class);
     }
+
+    @Override
+    public Map<Long, String> selectDeptNameByIds(Set<Long> ids) {
+        return sysDeptService.selectDeptNameByIds(ids);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java

@@ -7,6 +7,8 @@ import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.vo.SysDeptVo;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 部门管理 服务层
@@ -152,4 +154,6 @@ public interface ISysDeptService {
      * @return 部门列表
      */
     List<SysDeptVo> selectDeptsSimple();
+
+    Map<Long, String> selectDeptNameByIds(Set<Long> ids);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ComStaffServiceImpl.java

@@ -11,14 +11,10 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.system.domain.ComDept;
-import org.dromara.system.domain.ComPost;
-import org.dromara.system.domain.ComStaff;
+import org.dromara.system.domain.*;
 import org.dromara.system.domain.bo.ComStaffBo;
 import org.dromara.system.domain.vo.ComStaffVo;
-import org.dromara.system.mapper.ComDeptMapper;
-import org.dromara.system.mapper.ComPostMapper;
-import org.dromara.system.mapper.ComStaffMapper;
+import org.dromara.system.mapper.*;
 import org.dromara.system.service.IComStaffService;
 import org.springframework.stereotype.Service;
 
@@ -38,9 +34,9 @@ public class ComStaffServiceImpl extends ServiceImpl<ComStaffMapper, ComStaff> i
 
     private final ComStaffMapper baseMapper;
 
-    private final ComDeptMapper comDeptMapper;
+    private final SysDeptMapper sysDeptMapper;
 
-    private final ComPostMapper comPostMapper;
+    private final SysPostMapper sysPostMapper;
 
     /**
      * 查询人员信息
@@ -67,13 +63,13 @@ public class ComStaffServiceImpl extends ServiceImpl<ComStaffMapper, ComStaff> i
         List<ComStaffVo> records = result.getRecords();
         if (CollUtil.isNotEmpty(records)) {
             Set<Long> deptIds = records.stream().map(ComStaffVo::getDeptId).collect(Collectors.toSet());
-            Map<Long, String> deptMap = comDeptMapper.selectList(new LambdaQueryWrapper<ComDept>()
-                    .select(ComDept::getId, ComDept::getDeptName).in(ComDept::getId, deptIds)).stream()
-                .collect(Collectors.toMap(ComDept::getId, ComDept::getDeptName));
+            Map<Long, String> deptMap = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                    .select(SysDept::getDeptId, SysDept::getDeptName).in(SysDept::getDeptId, deptIds)).stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
             Set<Long> postIds = records.stream().map(ComStaffVo::getPostId).collect(Collectors.toSet());
-            Map<Long, String> postMap = comPostMapper.selectList(new LambdaQueryWrapper<ComPost>()
-                    .select(ComPost::getPostId, ComPost::getPostName).in(ComPost::getPostId, postIds)).stream()
-                .collect(Collectors.toMap(ComPost::getPostId, ComPost::getPostName));
+            Map<Long, String> postMap = sysPostMapper.selectList(new LambdaQueryWrapper<SysPost>()
+                    .select(SysPost::getPostId, SysPost::getPostName).in(SysPost::getPostId, postIds)).stream()
+                .collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
             records.forEach(item -> {
                 item.setDeptName(deptMap.get(item.getDeptId()));
                 item.setPostName(postMap.get(item.getPostId()));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -21,6 +21,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.ComDept;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysRole;
 import org.dromara.system.domain.SysUser;
@@ -36,10 +37,7 @@ import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 部门管理 服务实现
@@ -103,6 +101,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
         lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
             SysDept::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        if (ObjectUtil.isNotNull(bo.getCompanyId()) && !bo.getCompanyId().equals(0L)) {
+            lqw.gt(SysDept::getCompanyId, 0);
+        }
         lqw.orderByAsc(SysDept::getAncestors);
         lqw.orderByAsc(SysDept::getParentId);
         lqw.orderByAsc(SysDept::getOrderNum);
@@ -278,9 +279,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
         if (LoginHelper.isSuperAdmin()) {
             return;
         }
-        if (baseMapper.countDeptById(deptId) == 0) {
-            throw new ServiceException("没有权限访问部门数据！");
-        }
+//        if (baseMapper.countDeptById(deptId) == 0) {
+//            throw new ServiceException("没有权限访问部门数据！");
+//        }
     }
 
     @Override
@@ -433,4 +434,29 @@ public class SysDeptServiceImpl implements ISysDeptService {
             .eq(SysDept::getStatus, SystemConstants.NORMAL));
     }
 
+    public Map<Long, String> selectDeptNameByIds(Set<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        // 限制批量大小
+        if (ids.size() > 1000) {
+            throw new IllegalArgumentException("Batch size exceeds limit: " + ids.size());
+        }
+
+        List<SysDept> deptList = baseMapper.selectByIds(ids);
+        Map<Long, String> resultMap = new HashMap<>(ids.size());
+
+        // 初始化所有请求的 ID 为 null
+        ids.forEach(id -> resultMap.put(id, null));
+
+        if (deptList != null) {
+            deptList.stream()
+                .filter(dept -> dept.getDeptId() != null && dept.getDeptName() != null)
+                .forEach(dept -> resultMap.put(dept.getDeptId(), dept.getDeptName()));
+        }
+
+        return resultMap;
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java

@@ -69,7 +69,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType());
         lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
             SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime"));
-        lqw.orderByAsc(SysDictType::getDictId);
+        lqw.orderByDesc(SysDictType::getDictId);
         return lqw;
     }