Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -561,7 +561,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             List<String> deptIdList = deptMapper.selectAllChildListById(deptId);
             //获取当前分配人对应的工单分页数据
             IPage<WorkOrder> workPageData1 = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery()
-                    .in(WorkOrder::getDeptId, deptIdList)
+                    .in(WorkOrder::getAssignDeptId, deptIdList)
                     .eq(WorkOrder::getStatus, 15)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
@@ -610,7 +610,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
             //获取当前分配人对应的工单分页数据
             IPage<WorkOrder> workPageData1 = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery()
-                    .eq(WorkOrder::getDeptId, deptId)
+                    .eq(WorkOrder::getAssignDeptId, deptId)
                     .eq(WorkOrder::getStatus, 15)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())