Commit a6ce81454eae12ff5f201a41a510d6f14853a72c

Authored by xp.Huang
1 parent cd0517b2

fix: 产品品类导出,允许租户导出默认的物模型属性

... ... @@ -223,7 +223,7 @@ public class ThingsModelServiceImpl
223 223 List<TkThingsModelEntity> entityList =
224 224 baseMapper.selectList(
225 225 new LambdaQueryWrapper<TkThingsModelEntity>()
226   - .eq(TkThingsModelEntity::getTenantId, tenantId)
  226 + .in(TkThingsModelEntity::getTenantId, List.of(tenantId,TenantId.SYS_TENANT_ID.toString()))
227 227 .eq(TkThingsModelEntity::getCategoryId, categoryId)
228 228 .eq(TkThingsModelEntity::getFunctionType, typeEnum));
229 229 if (entityList.isEmpty()) {
... ...