Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -523,6 +523,7 @@ public class MaintenanceCompanyServiceImpl
 			parentCode = parent.getCode();
 		}
 		// 旧父节点的code
+		if(company.getCode() != null){
 			String oldParentCode = company.getCode().substring(0, company.getCode().length() - TreeParser.CODE_LENGTH);
 			List<MaintenanceCompany> children =
 					list(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getIsDelete, false).likeRight(MaintenanceCompany::getCode, company.getCode()).ne(MaintenanceCompany::getSequenceNbr, company.getSequenceNbr()));
@@ -535,6 +536,7 @@ public class MaintenanceCompanyServiceImpl
 			}
 			company.setCode(company.getCode().replaceFirst(oldParentCode, parentCode));
 		}
+	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)