Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
312fb207fd
2 changed files with 10 additions and 3 deletions
  1. +9
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 9
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -689,8 +689,15 @@ public class WxRentContractController extends WxContractBaseController {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
if (null == wxRentContract) wxRentContract = new WxRentContract();
wxRentContract.updateTenantInfo(getTenantInfo());
if (null != wxRentContract.getOnlyPropertyContractId() && wxRentContract.getOnlyPropertyContractId() > 0 ) {
wxRentContract.setId(wxRentContract.getOnlyPropertyContractId());
if (StringUtils.isNotBlank(wxRentContract.getOnlyPropertyContractId()) && (!"undefined".equals(wxRentContract.getOnlyPropertyContractId()))) {
try {
Long contractId = Long.parseLong(wxRentContract.getOnlyPropertyContractId());
if (contractId > 0 ) {
wxRentContract.setId(contractId);
}
} catch (NumberFormatException e) {
}
} else {
//正常状态, 物业合同
if (validStatus != null && 1 == validStatus) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -535,6 +535,6 @@ public class WxRentContract extends TenantEntity {
private List<Long> merchantIds;
@TableField(exist = false)
private Long onlyPropertyContractId;
private String onlyPropertyContractId;
}


Loading…
Cancel
Save