|
|
@@ -39,7 +39,7 @@
|
|
|
e.dict_code as order_source_id
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -60,7 +60,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -104,7 +104,7 @@
|
|
|
a.province_code as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -125,7 +125,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -182,7 +182,7 @@
|
|
|
a.city_code as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -203,7 +203,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -260,7 +260,7 @@
|
|
|
a.area_code as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -281,7 +281,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -338,7 +338,7 @@
|
|
|
a.id as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -359,7 +359,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -416,7 +416,7 @@
|
|
|
b.dict_code as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -437,7 +437,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -494,7 +494,7 @@
|
|
|
c.id as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -515,7 +515,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -572,7 +572,7 @@
|
|
|
d.category_id as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -593,7 +593,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -650,7 +650,7 @@
|
|
|
e.dict_code as keyId
|
|
|
FROM
|
|
|
region a
|
|
|
- join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL'
|
|
|
+ join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND b.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
|
|
@@ -671,7 +671,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE'
|
|
|
+ join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
|
|
|
<if test="adminCompanyIds != null and adminCompanyIds.size > 0">
|
|
|
AND e.company_wechat_id IN
|
|
|
<foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
|
‘linchangsheng’