feat: 全模块公司隔离 + crossDomain权限码动态跨域控制
- get_current_company_filter: 新增_has_cross_domain_permission, 权限码替代硬编码 - 补全11个Service的get_current_company_filter调用(semi/product/service/outbound/bom/trans/scrap/summary) - base/search修复: search_material此前无隔离, 已补全 - get_current_company_filter兜底: JWT缺company_name时返回__NO_COMPANY__防止放行 - permission.py: _get_operator_company补全返回值, 修复权限页保存逻辑 - 新增crossDomain迁移脚本, element_type=element挂system_mgmt下
This commit is contained in:
@ -158,9 +158,13 @@ class ServiceService:
|
||||
try:
|
||||
query = StockService.query.filter_by(is_deleted=False)
|
||||
|
||||
# 始终 join MaterialBase(base_id 为 NOT NULL,inner join 不会改变结果行数)
|
||||
# 用于公司过滤和关键词搜索
|
||||
query = query.join(StockService.base)
|
||||
|
||||
# 关键词联表搜索
|
||||
if keyword:
|
||||
query = query.join(StockService.base).filter(
|
||||
query = query.filter(
|
||||
db.or_(
|
||||
StockService.sku.ilike(f'%{keyword}%'),
|
||||
MaterialBase.name.ilike(f'%{keyword}%'),
|
||||
@ -168,6 +172,13 @@ class ServiceService:
|
||||
)
|
||||
)
|
||||
|
||||
# 【行级数据隔离】基于 JWT 多租户公司过滤
|
||||
from app.utils.decorators import get_current_company_filter
|
||||
|
||||
company_limit = get_current_company_filter()
|
||||
if company_limit is not None:
|
||||
query = query.filter(MaterialBase.company_name == company_limit)
|
||||
|
||||
# 日期过滤
|
||||
if start_date:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user