瀏覽代碼

同级目录创建文件夹判断是否有重复

xiewj 2 年之前
父節點
當前提交
8f008f9c97
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/DirServiceImpl.java

+ 2 - 2
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/DirServiceImpl.java

@@ -66,7 +66,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
                 entity.setParentId(1L);
                 entity.setParentId(1L);
             }
             }
             entity.setUserId(phone);
             entity.setUserId(phone);
-            List<DirEntity> dirEntities = findByIdAndName(entity.getId(), entity.getName(), entity.getType());
+            List<DirEntity> dirEntities = findByIdAndName(entity.getParentId(), entity.getName(), entity.getType());
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
                 log.info("{}",dirEntities);
                 log.info("{}",dirEntities);
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());
@@ -76,7 +76,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
             entity = this.findById(id);
             entity = this.findById(id);
             BaseRuntimeException.isNull(entity, ErrorEnum.FAILURE_SYS_3001.code(), ErrorEnum.FAILURE_SYS_3001.message());
             BaseRuntimeException.isNull(entity, ErrorEnum.FAILURE_SYS_3001.code(), ErrorEnum.FAILURE_SYS_3001.message());
             BeanUtils.copyProperties(param, entity);
             BeanUtils.copyProperties(param, entity);
-            List<DirEntity> dirEntities = findByIdAndName(entity.getId(), entity.getName(), entity.getType());
+            List<DirEntity> dirEntities = findByIdAndName(entity.getParentId(), entity.getName(), entity.getType());
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
                 log.info("{}",dirEntities);
                 log.info("{}",dirEntities);
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());