md

emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml

@@ -163,7 +163,7 @@
                 a.salesmen=#{params.privEmpName}
                 or  a.payee=#{params.privEmpName}
                 or a.salesmen in(
-                select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+                select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
                 )
                 )
             </if>

emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml

@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         select 1 from emis_settle_sub_bill b
                         where x2.settle_bill_no=b.settle_bill_no
                             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})
+                                or b.salesmen in(select salesmen from emis_salesmen_rel esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName})
                             )
                     )
                 )

emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml

@@ -177,7 +177,7 @@
                     x1.del_flag = '0'
                     AND x2.del_flag = '0'
                     AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
-                    AND ( x2.salesmen = #{params.privEmpName} OR x2.payee = #{params.privEmpName} OR x2.salesmen IN ( SELECT salesmen FROM emis_salesmen_rel WHERE sales_ass = #{params.privEmpName} ) )
+                    AND ( x2.salesmen = #{params.privEmpName} OR x2.payee = #{params.privEmpName} OR x2.salesmen IN ( SELECT salesmen FROM emis_salesmen_rel  esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass = #{params.privEmpName} ) )
                 )
             </if>
 

emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     b.salesmen=#{params.privEmpName}
                     or b.payee=#{params.privEmpName}
                     or b.salesmen in(
-                    select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+                    select salesmen from emis_salesmen_rel esr where esr.del_flag='0' and esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
                     )
                  )
                 )

emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml

@@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     a.salesmen=#{params.privEmpName}
                     or a.payee=#{params.privEmpName}
                     or a.salesmen in(
-                        select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+                        select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
                      )
                 )
             </if>
@@ -419,7 +419,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 a.salesmen=#{params.privEmpName}
                 or a.payee=#{params.privEmpName}
                 or a.salesmen in(
-                select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+                select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
                 )
                 )
             </if>
@@ -539,7 +539,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  a.salesmen=#{params.privEmpName}
                  or  a.payee=#{params.privEmpName}
                  or a.salesmen in(
-                    select salesmen from emis_salesmen_rel where sales_ass=#{params.privEmpName}
+                    select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
                  )
                 )
             </if>