diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 7ddcaefd0..9446372bb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -481,7 +481,6 @@ public class WxRentContractController extends WxContractBaseController { @ApiImplicitParams({}) @SystemControllerLog(description = "租金合同-合同生效") public ResultData effective(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); if (null == contract) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"租赁合同不存在"); @@ -651,10 +650,11 @@ public class WxRentContractController extends WxContractBaseController { statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); wxRentContract.setStatuss(statuss); } + if (null == wxRentContract.getIsPrivateMerchant()) { + wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); + } } - if (null == wxRentContract.getIsPrivateMerchant()) { - wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); - } + wxRentContract.setSortColumns(SortField.Createtime_DESC); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index f9354998f..c51442601 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -111,5 +111,7 @@ public class WxRentPropertyContractVo extends TenantEntity { private List merchantIds; private String queryShopNumber; + + private Integer isPrivateMerchant; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 779caa035..ff4a950b8 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -399,6 +399,7 @@ and rc.`contract_number` = #{contractNumber} + and rc.`is_private_merchant` = #{isPrivateMerchant} and rc.`id` = #{rentId}