From aa38114e4be79991715f76e360690fc39cf7c788 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:13:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 2 +- .../controller/contract/WxRentContractController.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index c120cb30f..859e6e085 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -69,7 +69,7 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); Integer rentStartType = wxPropertyContract.getRentStartType(); wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } MallUserInfo user = getUser(); 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 d1c8bc890..696ed660b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -87,9 +87,8 @@ public class WxRentContractController extends BaseController { MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); @@ -101,7 +100,7 @@ public class WxRentContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); Integer rentStartType = wxRentContract.getRentStartType(); wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); - if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } MallUserInfo user = getUser(); @@ -119,7 +118,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); @@ -139,7 +138,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); @@ -153,7 +152,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName());