判重处理

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java

@@ -50,7 +50,7 @@ public class IcPublicServiceOrgServiceImpl extends BaseServiceImpl<IcPublicServi
         if(null==staffInfo|| StringUtils.isBlank(staffInfo.getAgencyId())){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode());
         }
-        checkUnqiueName(formDto.getName(),formDto.getAgencyId(),null);
+        checkUnqiueName(formDto.getName(),staffInfo.getAgencyId(),null);
         formDto.setAgencyId(staffInfo.getAgencyId());
         formDto.setPids(staffInfo.getAgencyPIds());
         IcPublicServiceOrgEntity entity=ConvertUtils.sourceToTarget(formDto,IcPublicServiceOrgEntity.class);
@@ -78,7 +78,7 @@ public class IcPublicServiceOrgServiceImpl extends BaseServiceImpl<IcPublicServi
                 .eq(IcPublicServiceOrgEntity::getAgencyId,agencyId)
                 .ne(StringUtils.isNotBlank(id),IcPublicServiceOrgEntity::getId,id);
         int count=baseDao.selectCount(queryWrapper);
-        if(count>1){
+        if(count>0){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"名称已存在","名称已存在");
         }
     }