From 5eedd9c5aa0776f30723aa748ac84a1feefd1577 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Wed, 28 Jul 2021 16:54:05 +0800 Subject: [PATCH] 1 --- zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java index a1c45d6..3aefd94 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java @@ -237,9 +237,9 @@ public @ResponseBody AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) { -// if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) { - vipInfo.setShopId(getMe().getShopId()); -// } + + QueryUtil.setQueryLimit(vipInfo); + return showList(vipInfoService, vipInfo, pageVo); } @@ -293,7 +293,9 @@ } else { vipInfo.setVipState(Dictionary.VIP_STATE_HY); SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); - vipInfo.setShopId(users.getShopId()); + if(vipInfo.getShopId()==null){ + vipInfo.setShopId(users.getShopId()); + } return add(vipInfoService, vipInfo, "会员信息"); } } -- Gitblit v1.9.1