diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java index 88276c3..dca86fd 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java @@ -57,7 +57,7 @@ implements UpmsOrganizationService,InitializingBean { UpmsOrganization upmsOrganization = new UpmsOrganization(); upmsOrganization.setPid(0); List upmsOrganizations = mapper.selectByCondition(pojo); - if (upmsOrganizations.size() == 0) { + if (upmsOrganizations.size() == 0 || upmsOrganizations.get(0).getId().equals(pojo.getId())) { return super.update(pojo); } else { return ServerResponse.errorMsg("只允许有一个根组织"); @@ -78,6 +78,9 @@ implements UpmsOrganizationService,InitializingBean { // 1. 检查这个id下面还有没有下级组织,如果有就不能删除组织 UpmsOrganization upmsOrganization = new UpmsOrganization(); for (Integer integer : integers) { + if (integer.equals(1)) { + return ServerResponse.errorMsg("不允许删除根节点"); + } upmsOrganization.setPid(integer); List upmsOrganizations = mapper.selectByCondition(upmsOrganization); if (upmsOrganizations !=null && upmsOrganizations.size() >0){