|
|
@@ -791,7 +791,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- applyDeviceTypeScope(wrapper, condition.getDeviceTypeParentId());
|
|
|
+ // rootTypeId 优先(菜单 query 下发的全局约定),缺省时回退到 deviceTypeParentId(兼容 list.vue 等旧调用方)
|
|
|
+ String deviceScope = StringUtils.isNotEmpty(condition.getRootTypeId())
|
|
|
+ ? condition.getRootTypeId()
|
|
|
+ : condition.getDeviceTypeParentId();
|
|
|
+ applyDeviceTypeScope(wrapper, deviceScope);
|
|
|
return wrapper;
|
|
|
}
|
|
|
|