diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 84fbe63b3..2e5cdf1d0 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -131,13 +131,17 @@
+
- and ( salesmen=#{params.privEmpName}
- or payee=#{params.privEmpName}
+ and (
+ a.salesmen=#{params.privEmpName}
+ or a.payee=#{params.privEmpName}
+ or a.salesmen in(
+ select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+ )
)
-
order by create_time desc
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 3c004a700..10e555163 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -95,6 +95,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_time = #{updateTime}
and create_site like concat('%', #{createSite}, '%')
and update_site like concat('%', #{updateSite}, '%')
+
+
+ and apply_seq_no in(
+ select apply_seq_no from emis_settle_invoice_record
+ where del_flag='0' and settle_bill_no in(
+ select bill_no from emis_settle_sub_bill b
+ where del_flag='0'
+ and ( b.salesmen=#{params.privEmpName} or b.payee=#{params.privEmpName}
+ or b.salesmen in(select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName})
+ )
+ )
+ )
+
+
order by create_time desc
@@ -315,8 +329,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
update emis_settle_invoice_ch_record set del_flag='0' where id = #{id}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index 8ece5f3b5..0af224f9a 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -114,6 +114,21 @@
and update_time = #{updateTime}
and create_site like concat('%', #{createSite}, '%')
and update_site like concat('%', #{updateSite}, '%')
+
+
+
+ and settle_bill_no in(
+ select bill_no from emis_settle_sub_bill b where del_flag='0'
+ and (
+ b.salesmen=#{params.privEmpName}
+ or b.payee=#{params.privEmpName}
+ or b.salesmen in(
+ select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+ )
+ )
+ )
+
+
order by create_time desc
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 957af4d56..888d34dad 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -185,36 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (
- a.send_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.dispatch_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.sign_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or a.salesmen=#{params.privEmpName}
+ a.salesmen=#{params.privEmpName}
or a.payee=#{params.privEmpName}
- )
-
+ or a.salesmen in(
+ select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+ )
+ )
+
order by b.create_time desc
@@ -309,34 +286,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (
- a.send_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.dispatch_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.sign_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or a.salesmen=#{params.privEmpName}
+ a.salesmen=#{params.privEmpName}
or a.payee=#{params.privEmpName}
+ or salesmen in(
+ select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+ )
)
@@ -444,34 +398,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (
- a.send_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.dispatch_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or
- a.sign_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
- or a.salesmen=#{params.privEmpName}
- or a.payee=#{params.privEmpName}
+ a.salesmen=#{params.privEmpName}
+ or a.payee=#{params.privEmpName}
+ or salesmen in(
+ select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+ )
)