Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
c7415d94d7
Se han modificado 3 ficheros con 17 adiciones y 12 borrados
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +7
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +7
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Ver fichero

@@ -54,10 +54,11 @@ public class BaseController {
public MallUserInfo getUser(){ public MallUserInfo getUser(){
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
// MallUserInfo user = new MallUserInfo(); // MallUserInfo user = new MallUserInfo();
// user.setId(941561428182753280L);
// user.setName("tt01");
// user.setId(321127266275430400L);
// user.setName("alitest");
// user.setTenantId("789"); // user.setTenantId("789");
// user.setParentTenantId(null); // user.setParentTenantId(null);
// user.setIsAdmin(1);
return user; return user;
} }




+ 7
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Ver fichero

@@ -93,11 +93,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService


@Override @Override
public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) {
List<Long> 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<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0);
if (null == mids || mids.size() <= 0 ) {
record.setId(-1L);
} else {
record.setMerchantIds(mids);
}
} }
PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record));
return pageInfo; return pageInfo;


+ 7
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver fichero

@@ -1812,11 +1812,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {


@Override @Override
public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) {
List<Long> 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<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0);
if (null == mids || mids.size() <= 0 ) {
rentContract.setId(-1L);
} else {
rentContract.setMerchantIds(mids);
}
} }
//PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); //PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract));
PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract));


Cargando…
Cancelar
Guardar