|
|
@ -406,9 +406,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
|
|
|
|
if (organizeService.isExistByFullName(entity, false, false)) {
|
|
|
|
if (organizeService.isExistByFullName(entity, false, false)) {
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
// if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
return ActionResult.fail("公司编码不能重复");
|
|
|
|
// return ActionResult.fail("公司编码不能重复");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
@ -446,9 +446,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
|
|
|
|
if (organizeService.isExistByFullName(entity, false, false)) {
|
|
|
|
if (organizeService.isExistByFullName(entity, false, false)) {
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
// if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
return ActionResult.fail("公司编码不能重复");
|
|
|
|
// return ActionResult.fail("公司编码不能重复");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
@ -646,9 +646,9 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
|
|
|
|
if (organizeService.isExistByFullName(entity, false, true)) {
|
|
|
|
if (organizeService.isExistByFullName(entity, false, true)) {
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
return ActionResult.fail("公司名称不能重复");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
// if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
|
|
|
|
return ActionResult.fail("公司编码不能重复");
|
|
|
|
// return ActionResult.fail("公司编码不能重复");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
// 通过组织id获取父级组织
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
|
String organizeIdTree = getOrganizeIdTree(entity);
|
|
|
|
entity.setOrganizeIdTree(organizeIdTree);
|
|
|
|
entity.setOrganizeIdTree(organizeIdTree);
|
|
|
|