Commit 03db5191 authored by tianbo's avatar tianbo

Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_test

parents 57fed8f8 aa39501d
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
LEFT JOIN ${staticTableName} psd ON ei.use_code = psd.unit_code LEFT JOIN ${staticTableName} psd ON ei.use_code = psd.unit_code
where where
ei.is_delete = '0' ei.is_delete = '0'
and ei.data_sources = '陕西省内企业'
GROUP BY GROUP BY
ei.use_code ei.use_code
</select> </select>
......
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
AND pc.org_code IS NOT NULL AND pc.org_code IS NOT NULL
AND tzei.is_delete = '0' AND tzei.is_delete = '0'
AND pc.is_deleted = 'f' AND pc.is_deleted = 'f'
and tzei.data_sources = '陕西省内企业'
AND (tzei.unit_type <![CDATA[<>]]> '检验机构' OR tzei.unit_type <![CDATA[<>]]> '检测机构') AND (tzei.unit_type <![CDATA[<>]]> '检验机构' OR tzei.unit_type <![CDATA[<>]]> '检测机构')
AND tui.amos_user_id IN (SELECT USER_ID FROM privilege_group_user WHERE GROUP_SEQ = #{groupId}) AND tui.amos_user_id IN (SELECT USER_ID FROM privilege_group_user WHERE GROUP_SEQ = #{groupId})
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment