From 29e3c9ad98a2ddd982a336409a44beefb665c633 Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Fri, 6 Jan 2023 13:56:32 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A6=AA=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=80=E3=81=AE=E5=AD=98=E5=9C=A8=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E6=99=82=E3=81=AB=E4=BD=BF=E3=81=86ID=E3=81=8C?=
 =?UTF-8?q?=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/CabinetFilesEditController.php | 2 +-
 Model/CabinetFile.php                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Controller/CabinetFilesEditController.php b/Controller/CabinetFilesEditController.php
index 2f7b155..39758fb 100644
--- a/Controller/CabinetFilesEditController.php
+++ b/Controller/CabinetFilesEditController.php
@@ -715,6 +715,6 @@ private function __isExistsParentFolder() {
 			$this->request->named,
 			'parent_id'
 		);
-		return $this->CabinetFile->isExists($this->_cabinet['Cabinet']['key'], $parentId);
+		return $this->CabinetFile->isExistsByTreeId($this->_cabinet['Cabinet']['key'], $parentId);
 	}
 }
diff --git a/Model/CabinetFile.php b/Model/CabinetFile.php
index d89019f..d0ebb0e 100644
--- a/Model/CabinetFile.php
+++ b/Model/CabinetFile.php
@@ -574,13 +574,13 @@ public function isAllowUnzip($cabinetFile) {
  * isExists
  *
  * @param string $cabinetKey Caibnet.key
- * @param string|int $cabinetFileId CabinetFile.id
+ * @param string|int $cabinetFileTreeId CabinetFile.id
  * @return bool
  */
-	public function isExists($cabinetKey, $cabinetFileId) {
+	public function isExistsByTreeId($cabinetKey, $cabinetFileTreeId) {
 		$conditions = [
 			'CabinetFile.cabinet_key' => $cabinetKey,
-			'CabinetFile.id' => $cabinetFileId,
+			'CabinetFile.cabinet_file_tree_id' => $cabinetFileTreeId,
 		];
 		$conditions = $this->getWorkflowConditions($conditions);
 		$count = $this->find('count', ['conditions' => $conditions]);