Skip to content

A
amos-boot-biz
Commit 1ec4fe89 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.bug修改 公司未过滤删除状态导致存在多个相同编码的公司

parent 256925bc
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml
View file @ 1ec4fe89
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
LEFT JOIN person_account b ON a.sequence_nbr = b.person_id LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
<where> <where>
a.qrcode_color <![CDATA[<>]]> ''
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND a.project_org_code like concat(#{parentCode},'%') AND a.project_org_code like concat(#{parentCode},'%')
</if> </if>
...@@ -246,6 +247,7 @@ ...@@ -246,6 +247,7 @@
LEFT JOIN person_account b ON a.sequence_nbr = b.person_id LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
<where> <where>
a.qrcode_color <![CDATA[<>]]> ''
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND a.project_org_code like concat(#{parentCode},'%') AND a.project_org_code like concat(#{parentCode},'%')
</if> </if>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/bin/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.ORG_CODE like concat(#{parentCode},'%') b.ORG_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.ORG_CODE like concat(#{parentCode},'%') b.ORG_CODE like concat(#{parentCode},'%')
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
SBBM as objectId SBBM as objectId
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
c.SBBM as objectId c.SBBM as objectId
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.ORG_CODE like concat(#{parentCode},'%') b.ORG_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.ORG_CODE like concat(#{parentCode},'%') b.ORG_CODE like concat(#{parentCode},'%')
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
SBBM as objectId SBBM as objectId
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
c.SBBM as objectId c.SBBM as objectId
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.ORG_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/bin/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/bin/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml
View file @ 1ec4fe89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
count( 1 ) as value count( 1 ) as value
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
b.COMPANY_CODE like concat(#{parentCode},'%') b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
count(1) count(1)
FROM FROM
sjgl_zsj_zsbtz a sjgl_zsj_zsbtz a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
ifnull(b.COMPANY_NAME, '') AS stationName ifnull(b.COMPANY_NAME, '') AS stationName
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
count(1) count(1)
FROM FROM
fdgl_job_main a fdgl_job_main a
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.COMPANY_CODE like concat(#{parentCode},'%')
......
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