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

720yun_fd_manage/gis_service/src/main/java/com/gis/service/DirService.java

@@ -20,6 +20,7 @@ public interface DirService extends IBaseService<DirEntity, Long>{
     Result remove(Long id);
 
     List<DirEntity> findByIdAndName(Long parentId,String name,String type);
+    List<DirEntity> findByIdAndNameAndUserId(Long parentId,String name,String type,String userId);
     List<DirEntity> findByParentId(Long parentId);
 
 }

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.setUserId(phone);
-            List<DirEntity> dirEntities = findByIdAndName(entity.getParentId(), entity.getName(), entity.getType());
+            List<DirEntity> dirEntities = findByIdAndNameAndUserId(entity.getParentId(), entity.getName(), entity.getType(),entity.getUserId());
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
                 log.info("{}",dirEntities);
                 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);
             BaseRuntimeException.isNull(entity, ErrorEnum.FAILURE_SYS_3001.code(), ErrorEnum.FAILURE_SYS_3001.message());
             BeanUtils.copyProperties(param, entity);
-            List<DirEntity> dirEntities = findByIdAndName(entity.getParentId(), entity.getName(), entity.getType());
+            List<DirEntity> dirEntities = findByIdAndNameAndUserId(entity.getParentId(), entity.getName(), entity.getType(),entity.getUserId());
             if (ObjectUtil.isNotNull(dirEntities)&&dirEntities.size()>0){
                 log.info("{}",dirEntities);
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());
@@ -172,6 +172,17 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
     }
 
     @Override
+    public List<DirEntity> findByIdAndNameAndUserId(Long parentId, String name, String type, String userId) {
+        DirEntity parm=new DirEntity();
+        parm.setName(name);
+        parm.setParentId(parentId);
+        parm.setType(type);
+        parm.setIsDelete(0);
+        parm.setUserId(userId);
+        return getBaseMapper().select(parm);
+    }
+
+    @Override
     public List<DirEntity>  findByParentId(Long parentId) {
         Condition condition = new Condition(DirEntity.class);
         condition.createCriteria().andEqualTo("parentId", parentId);