Merge branch 'release_toaliyun_real' into release_real_200809

mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

@@ -456,10 +456,12 @@ public class WxRentContractController extends WxContractBaseController {
         	wxRentContractService.updateRentContract(contract);
         	
         	if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
-        		WxPropertyContract propertyContract = wxPropertyContractService.getSimpleDetail(wxRentContract.getPropertyId());
-        		propertyContract.setStatus(EnumRentContractStatus.INVALID.getCode());
-        		propertyContract.setUpdatetime(new Date());
-        		wxPropertyContractService.updatePropertyContract(propertyContract);
+        		if (null != wxRentContract.getPropertyId()) {
+	        		WxPropertyContract propertyContract = wxPropertyContractService.getSimpleDetail(wxRentContract.getPropertyId());
+	        		propertyContract.setStatus(EnumRentContractStatus.INVALID.getCode());
+	        		propertyContract.setUpdatetime(new Date());
+	        		wxPropertyContractService.updatePropertyContract(propertyContract);
+        		}
             }
         	return new ResultData();
         }else {