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,17 +523,19 @@ public class MaintenanceCompanyServiceImpl
 			parentCode = parent.getCode();
 		}
 		// 旧父节点的code
-		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()));
-		if (!ValidationUtil.isEmpty(children)) {
-			String finalParentCode = parentCode;
-			children.forEach(i -> {
-				i.setCode(i.getCode().replaceFirst(oldParentCode, finalParentCode));
-			});
-			updateBatchById(children);
+		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()));
+			if (!ValidationUtil.isEmpty(children)) {
+				String finalParentCode = parentCode;
+				children.forEach(i -> {
+					i.setCode(i.getCode().replaceFirst(oldParentCode, finalParentCode));
+				});
+				updateBatchById(children);
+			}
+			company.setCode(company.getCode().replaceFirst(oldParentCode, parentCode));
 		}
-		company.setCode(company.getCode().replaceFirst(oldParentCode, parentCode));
 	}
 
 	@Override