From d8b3a950a05fb7685d0c489b56e70b39b9a3f999 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 1 Jul 2024 10:56:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=90=E8=90=A5=E5=95=86=E5=88=97=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileMerchantInfoController.java | 2 +- .../service/impl/PileMerchantInfoServiceImpl.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index cb4b52977..a272175d9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -42,7 +42,7 @@ public class PileMerchantInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('pile:merchant:list')") @GetMapping("/list") public TableDataInfo list(PileMerchantInfo pileMerchantInfo) { - startPage(); + // startPage(); List list = pileMerchantInfoService.selectPileMerchantInfoListWithAuth(pileMerchantInfo); return getDataTable(list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 4518e7d3e..3515f2fdb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DictUtils; +import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; @@ -77,12 +78,12 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { */ @Override public List selectPileMerchantInfoListWithAuth(PileMerchantInfo pileMerchantInfo) { - AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); - if (authorizedMap == null) { - // 为空表示没有权限，返回空数组 - return Lists.newArrayList(); - } - pileMerchantInfo.setStationDeptIds(authorizedMap.getStationDeptIds()); + // AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); + // if (authorizedMap == null) { + // // 为空表示没有权限，返回空数组 + // return Lists.newArrayList(); + // } + // pileMerchantInfo.setStationDeptIds(authorizedMap.getStationDeptIds()); // 当前登录用户的运营商权限列表 List list = UserUtils.getMerchantInfoVOList(); @@ -90,6 +91,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { List collect = list.stream().map(MerchantInfoVO::getDeptId).collect(Collectors.toList()); pileMerchantInfo.setMerchantDeptIds(collect); } + PageUtils.startPage(); return selectPileMerchantInfoList(pileMerchantInfo); }