|
@@ -91,8 +91,8 @@
|
|
|
v.value_name valueName,
|
|
v.value_name valueName,
|
|
|
s.list_show listShow
|
|
s.list_show listShow
|
|
|
from machine_attrs t
|
|
from machine_attrs t
|
|
|
- left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name = 'machine_attr'
|
|
|
|
|
- left join attr_value v on t.`value` = v.`value` and t.spec_cd = v.spec_cd and v.status_cd = '0'
|
|
|
|
|
|
|
+ left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and t.spec_cd = s.spec_cd and s.table_name = 'machine_attr'
|
|
|
|
|
+ left join attr_value v on t.`value` = v.`value` and s.spec_id = v.spec_id and v.status_cd = '0'
|
|
|
where 1 =1
|
|
where 1 =1
|
|
|
<if test="machineId !=null and machineId != ''">
|
|
<if test="machineId !=null and machineId != ''">
|
|
|
and t.machine_id= #{machineId}
|
|
and t.machine_id= #{machineId}
|