diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index 987fdba03..314122723 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java @@ -63,12 +63,11 @@ public class EmisCustomerUserController extends EmisBaseController /** * 查询快递客户用户列表 */ -// @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") + // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") @GetMapping("/listMonthUser") - public TableDataInfo listMonthUser(EmisCustomerUser emisCustomerUser) - { + public TableDataInfo listMonthUser(EmisCustomerUser emisCustomerUser) { startPage(); - if(!(getLoginUser().getUser().isTopSite())){ + if (!(getLoginUser().getUser().isTopSite())) { emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); } emisCustomerUser.setCustomerType("2"); @@ -76,6 +75,21 @@ public class EmisCustomerUserController extends EmisBaseController return getDataTable(list); } + /** + * 查询快递客户用户列表(全部) + */ + // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") + @GetMapping("/listMonthUserAll") + public TableDataInfo listMonthUserAll(EmisCustomerUser emisCustomerUser) { + startPage(); +// if (!(getLoginUser().getUser().isTopSite())) { +// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); +// } + emisCustomerUser.setCustomerType("2"); + List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); + return getDataTable(list); + } + // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") @GetMapping("/listMoneyUser") public TableDataInfo listMoneyUser(EmisCustomerUser emisCustomerUser)