|
@@ -12,7 +12,6 @@ import com.doc.common.core.domain.AjaxResult;
|
|
import com.doc.common.core.page.TableDataInfo;
|
|
import com.doc.common.core.page.TableDataInfo;
|
|
import com.doc.common.enums.BusinessType;
|
|
import com.doc.common.enums.BusinessType;
|
|
import com.doc.common.enums.EventLevel;
|
|
import com.doc.common.enums.EventLevel;
|
|
-import com.doc.common.utils.DateUtils;
|
|
|
|
import com.doc.common.utils.SecurityUtils;
|
|
import com.doc.common.utils.SecurityUtils;
|
|
import com.doc.common.utils.poi.ExcelUtil;
|
|
import com.doc.common.utils.poi.ExcelUtil;
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
@@ -306,9 +305,15 @@ public class DocDirController extends BaseController {
|
|
query.setSearchValue(docDir.getDirName());
|
|
query.setSearchValue(docDir.getDirName());
|
|
List<DocDir> list = docDirService.selectDocDirList(query);
|
|
List<DocDir> list = docDirService.selectDocDirList(query);
|
|
if (list.size() > 0 && !list.get(0).getDirId().equals(docDir.getDirId())) {
|
|
if (list.size() > 0 && !list.get(0).getDirId().equals(docDir.getDirId())) {
|
|
|
|
+ String prefix = "(重命名)-";
|
|
String dirName = docDir.getDirName();
|
|
String dirName = docDir.getDirName();
|
|
- dirName = dirName + "-" + DateUtils.dateTimeNow();
|
|
|
|
|
|
+ if (dirName.contains(prefix)) {
|
|
|
|
+ dirName = dirName.replace(prefix, prefix + "1");
|
|
|
|
+ } else {
|
|
|
|
+ dirName = "(重命名)-" + dirName;
|
|
|
|
+ }
|
|
docDir.setDirName(dirName);
|
|
docDir.setDirName(dirName);
|
|
|
|
+ checkDuplicateNames(docDir);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|