winter 2 лет назад
Родитель
Сommit
7d3fd73b19
5 измененных файлов: 7 добавлений и 6 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -78,7 +78,7 @@ public class WxMerchantController extends BaseController {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
}
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false);
return new ResultData(page);
@@ -376,7 +376,7 @@ public class WxMerchantController extends BaseController {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
}
wxMerchantService.exportData(wxMerchant,request,response);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -70,7 +70,7 @@ public class WxPropertyContractController extends WxContractBaseController {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxPropertyContract.setFloorForRule(dataRule.getFloorIds());
//wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds());
wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds());
}
PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize);
Integer hasFlow = null;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -79,7 +79,7 @@ public class WxRentContractController extends WxContractBaseController {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxRentContract.setFloorForRule(dataRule.getFloorIds());
//wxRentContract.setBusinessForRule(dataRule.getBussinessIds());
wxRentContract.setBusinessForRule(dataRule.getBussinessIds());
}
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize);
Integer hasFlow = null;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java Просмотреть файл

@@ -55,7 +55,7 @@ public class WxRentPropertyContractController extends WxContractBaseController {
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds());
//wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds());
wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds());
}
PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize);
Integer hasFlow = null;


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java Просмотреть файл

@@ -42,10 +42,11 @@ public class WxUserDataRule extends TenantEntity {
}
public String getBussinessIds() {
/**
if (StringUtils.isNotEmpty(business)) {
Object[] data = JSONArray.parseArray(business).toArray();
return StringUtils.join(data, ",");
}
}*/
return null;
}



Загрузка…
Отмена
Сохранить