From c7415d94d7a6da502a6436db0bd303c1f18faa34 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 19:44:26 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/base/BaseController.java | 5 +++-- .../service/impl/WxPropertyContractServiceImpl.java | 12 +++++++----- .../service/impl/WxRentContractServiceImpl.java | 12 +++++++----- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index ea6d220d7..fa0b4e34a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -54,10 +54,11 @@ public class BaseController { public MallUserInfo getUser(){ MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); // MallUserInfo user = new MallUserInfo(); -// user.setId(941561428182753280L); -// user.setName("tt01"); +// user.setId(321127266275430400L); +// user.setName("alitest"); // user.setTenantId("789"); // user.setParentTenantId(null); +// user.setIsAdmin(1); return user; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 85945e788..32ccee427 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -93,11 +93,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { - List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); - if (null == mids || mids.size() <= 0 ) { - record.setId(-1L); - } else { - record.setMerchantIds(mids); + if (StringUtils.isNotBlank(record.getFloorForRule())) { + List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + record.setId(-1L); + } else { + record.setMerchantIds(mids); + } } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); return pageInfo; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 95971a7bf..ca0052ad7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1812,11 +1812,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { - List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); - if (null == mids || mids.size() <= 0 ) { - rentContract.setId(-1L); - } else { - rentContract.setMerchantIds(mids); + if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { + List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + rentContract.setId(-1L); + } else { + rentContract.setMerchantIds(mids); + } } //PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract));