diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index bd2b50636..bc6407c56 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -92,6 +92,8 @@ public class EmisSettleBillController extends BaseController { startPage(); + setPrivParams(emisSettleBill); + String billCodeStr = MapUtil.getStr(emisSettleBill.getParams(),"billCode"); if(!StringUtils.isEmpty(billCodeStr)){ emisSettleBill.getParams().put("billCode",WaybillHelper.formatQueryValue(billCodeStr)); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java index ce7f48a48..0ea600170 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java @@ -60,6 +60,9 @@ public class EmisSettleInvoiceChRecordController extends BaseController public TableDataInfo list(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) { startPage(); + + setPrivParams(emisSettleInvoiceChRecord); + List list = emisSettleInvoiceChRecordService.selectEmisSettleInvoiceChRecordList(emisSettleInvoiceChRecord); return getDataTable(list); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java index 12bbd1d6c..364991c6f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java @@ -59,6 +59,9 @@ public class EmisSettleInvoiceRecordController extends BaseController public TableDataInfo list(EmisSettleInvoiceRecord emisSettleInvoiceRecord) { startPage(); + + setPrivParams(emisSettleInvoiceRecord); + List list = emisSettleInvoiceRecordService.selectEmisSettleInvoiceRecordList(emisSettleInvoiceRecord); return getDataTable(list); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java index bcb25291c..c8c30dc5c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java @@ -61,6 +61,9 @@ public class EmisSettlePayRecordController extends BaseController public TableDataInfo list(EmisSettlePayRecord emisSettlePayRecord) { startPage(); + + setPrivParams(emisSettlePayRecord); + List list = emisSettlePayRecordService.selectEmisSettlePayRecordList(emisSettlePayRecord); return getDataTable(list); } diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml index 8b5f83a54..61ba91225 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml @@ -103,6 +103,19 @@ 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 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