feat: bug-369 添加对产品线和数据权限的支持
This commit is contained in:
parent
61b9111d84
commit
f58bc2bd53
|
|
@ -72,10 +72,13 @@
|
||||||
INNER JOIN dictionary_item di ON di.id=d.device_state
|
INNER JOIN dictionary_item di ON di.id=d.device_state
|
||||||
LEFT JOIN dictionary_item di2 ON di2.id=d.warranty_state
|
LEFT JOIN dictionary_item di2 ON di2.id=d.warranty_state
|
||||||
LEFT JOIN dictionary_item_translate dit2 ON dit2.dictionary_item_id=d.warranty_state AND dit2.language_code=#{language}
|
LEFT JOIN dictionary_item_translate dit2 ON dit2.dictionary_item_id=d.warranty_state AND dit2.language_code=#{language}
|
||||||
WHERE d.data_valid_state=1 AND di.`code`='Normal' AND c.id IN
|
WHERE d.data_valid_state=1 AND di.`code`='Normal'
|
||||||
<foreach collection="companyIds" open="(" close=")" item="companyId" separator=",">
|
<if test="companyIds!=null">
|
||||||
#{companyId}
|
AND c.id IN
|
||||||
</foreach>
|
<foreach collection="companyIds" open="(" close=")" item="companyId" separator=",">
|
||||||
|
#{companyId}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
<if test="productionLines!=null">
|
<if test="productionLines!=null">
|
||||||
AND d.production_line_id in
|
AND d.production_line_id in
|
||||||
<foreach collection="productionLines" open="(" close=")" item="plId" separator=",">
|
<foreach collection="productionLines" open="(" close=")" item="plId" separator=",">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue