Commit ccce33dd by lzxry

null

parent ae8dd3dd
...@@ -653,7 +653,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -653,7 +653,7 @@ public class ContractServiceImpl implements ContractService {
} }
}else if("cas".equals(resource.getPlatform())){ }else if("cas".equals(resource.getPlatform())){
ADIUser adiUser = adiAccountService.findOne(resource.getEmail(), resource.getContractType()); ADIUser adiUser = adiAccountService.findOne(resource.getEmail(), resource.getContractType());
if(StringUtils.isEmpty(adiUser.getSendTime())){ if(adiUser==null || StringUtils.isEmpty(adiUser.getSendTime())){
resource.setShareSign(0); resource.setShareSign(0);
}else{ }else{
resource.setShareSign(1); resource.setShareSign(1);
......
...@@ -33,7 +33,7 @@ public class CASIPSendTimeTask { ...@@ -33,7 +33,7 @@ public class CASIPSendTimeTask {
List<Contract> contracts = contractRepository.findByPlatformAndShareSign("cas",0); List<Contract> contracts = contractRepository.findByPlatformAndShareSign("cas",0);
for (Contract contract : contracts) { for (Contract contract : contracts) {
ADIUser adiUser = adiAccountService.findOne(contract.getEmail(), contract.getContractType()); ADIUser adiUser = adiAccountService.findOne(contract.getEmail(), contract.getContractType());
if(!StringUtils.isEmpty(adiUser.getSendTime())){ if(adiUser!=null&&!StringUtils.isEmpty(adiUser.getSendTime())){
contract.setShareSign(1); contract.setShareSign(1);
DateTime sendTime = new DateTime(DateUtil.parseDate(DateUtil.C_TIME_PATTON_DEFAULT,adiUser.getSendTime())); DateTime sendTime = new DateTime(DateUtil.parseDate(DateUtil.C_TIME_PATTON_DEFAULT,adiUser.getSendTime()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment