diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java index 6555e02f9..0f129b1f2 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java @@ -70,6 +70,10 @@ public class EmisSiteAccountController extends EmisBaseController public TableDataInfo list(EmisSiteAccount emisSiteAccount) { startPage(); + + setPrivParams(emisSiteAccount); + + List list = emisSiteAccountService.selectEmisSiteAccountList(emisSiteAccount); return getDataTable(list); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java index f5c2d8397..b9e4929ca 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java @@ -56,6 +56,9 @@ public class EmisSiteSettleRecordController extends EmisBaseController public TableDataInfo list(EmisSiteSettleRecord emisSiteSettleRecord) { startPage(); + + setPrivParams(emisSiteSettleRecord); + List list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord); return getDataTable(list); } @@ -68,9 +71,9 @@ public class EmisSiteSettleRecordController extends EmisBaseController @PostMapping("/export") public void export(HttpServletResponse response, EmisSiteSettleRecord emisSiteSettleRecord) { - List list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord); - ExcelUtil util = new ExcelUtil(EmisSiteSettleRecord.class); - util.exportExcel(response, list, "网点账户结算记录数据"); +// List list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord); +// ExcelUtil util = new ExcelUtil(EmisSiteSettleRecord.class); +// util.exportExcel(response, list, "网点账户结算记录数据"); } /** diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml index 9bf2e2835..6572e8be4 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml @@ -38,6 +38,7 @@ del_flag='0' + and id = #{id} and acc_code=#{accCode} and site_code= #{siteCode} @@ -65,7 +66,6 @@ and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') - and cur_money ]]> watch_money @@ -75,6 +75,20 @@ + + and ( + 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 + ) + ) + + + order by create_time desc