处理文档目录重名相关

doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -11,6 +11,7 @@ import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.domain.entity.SysRole;
 import com.doc.common.enums.BusinessType;
 import com.doc.common.enums.EventLevel;
+import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
@@ -257,6 +258,7 @@ public class DocDirController extends BaseController {
     @Log(title = "文档目录管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DocDir docDir) {
+        checkDuplicateNames(docDir);
         int i = docDirService.insertDocDir(docDir);
         //如果是组织目录,则需要插入成员
         String dept = "2";
@@ -270,6 +272,24 @@ public class DocDirController extends BaseController {
     }
 
     /**
+     * 检查重名
+     *
+     * @param docDir 目录信息
+     */
+    private void checkDuplicateNames(DocDir docDir) {
+        DocDir query = new DocDir();
+        query.setParentId(docDir.getParentId());
+        query.setSearchValue(docDir.getDirName());
+        List list = docDirService.selectDocDirList(query);
+        if (list.size() > 0) {
+            String dirName = docDir.getDirName();
+            dirName = dirName + "-" + DateUtils.dateTimeNow();
+            docDir.setDirName(dirName);
+        }
+
+    }
+
+    /**
      * 新建目录
      */
     @ApiOperation("验证访问码")
@@ -292,6 +312,8 @@ public class DocDirController extends BaseController {
         docDir.setDirName(name);
         docDir.setUpdateBy(SecurityUtils.getUsername());
 
+        checkDuplicateNames(docDir);
+
         return toAjax(docDirService.updateDocDir(docDir));
     }
 

doc-biz/src/main/java/com/doc/biz/service/impl/DocDirServiceImpl.java

@@ -95,7 +95,6 @@ public class DocDirServiceImpl implements IDocDirService {
     @Override
     public int insertDocDir(DocDir docDir) {
         docDir.setCreateTime(DateUtils.getNowDate());
-        checkDuplicateNames(docDir);
         //如果设置了访问码，则需要加密存储
         if (StringUtils.isNotEmpty(docDir.getAccessCode())) {
             String pass = SecurityUtils.encryptPassword(docDir.getAccessCode());
@@ -105,23 +104,6 @@ public class DocDirServiceImpl implements IDocDirService {
         return docDirMapper.insertDocDir(docDir);
     }
 
-    /**
-     * 检查重名
-     *
-     * @param docDir 目录信息
-     */
-    private void checkDuplicateNames(DocDir docDir) {
-        DocDir query = new DocDir();
-        query.setParentId(docDir.getParentId());
-        query.setSearchValue(docDir.getDirName());
-        List list = selectDocDirList(query);
-        if (list.size() > 0) {
-            String dirName = docDir.getDirName();
-            dirName = dirName + "-" + DateUtils.dateTimeNow();
-            docDir.setDirName(dirName);
-        }
-
-    }
 
     /**
      * 修改文档目录管理
@@ -131,7 +113,6 @@ public class DocDirServiceImpl implements IDocDirService {
      */
     @Override
     public int updateDocDir(DocDir docDir) {
-        checkDuplicateNames(docDir);
         docDir.setUpdateTime(DateUtils.getNowDate());
         return docDirMapper.updateDocDir(docDir);
     }