diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index b4997a4..d51f04e 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -128,14 +128,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { - throw new RenException("您输入的编码已存在"); - } + if (StringUtils.isNotBlank(partyCode) && getCodeCount(dto) > 0) { + throw new RenException("您输入的编码已存在"); } SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); if (!entity.getAllAreaCode().isEmpty()) { - String[] areaCodeArray = entity.getAllAreaCode().split(","); + String[] areaCodeArray = entity.getAllAreaCode().split(StrConstant.COMMA); entity.setParentAreaCode(areaCodeArray[areaCodeArray.length - 2]); } entity.setPids(getPidList(entity.getPid())); @@ -153,10 +151,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { - throw new RenException("您输入的编码已存在"); - } + if (StringUtils.isNotBlank(partyCode) && getCodeCount(dto) > 0) { + throw new RenException("您输入的编码已存在"); } SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); @@ -165,7 +161,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl newDataScopeList = Lists.newArrayList(); - for (int i = 0; i < dataScopeDeptList.size(); i++) { - deptId = dataScopeDeptList.get(i); + for (Long aLong : dataScopeDeptList) { + deptId = aLong; if (!parentDeptIdList.contains(deptId)) { newDataScopeList.add(deptId); }