先回款待录入

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -613,7 +613,8 @@ public class ContractServiceImpl implements ContractService {
     public Contract update(User loginUser, Contract resource, String ip) {
 
         Contract contract = contractRepository.findOne(resource.getId());
-        if (!contract.getContractCode().equals(resource.getContractCode())) {
+
+        if (resource.getContractCode()!=null && !resource.getContractCode().equals(contract.getContractCode())) {
             Contract contractExist = contractRepository.findByCode(resource.getContractCode().trim());
             if (contractExist != null) {
                 // 合同编号已存在