diff --git a/app/Controllers/Article/Receipt.php b/app/Controllers/Article/Receipt.php
index fbfbec4..b6b6927 100644
--- a/app/Controllers/Article/Receipt.php
+++ b/app/Controllers/Article/Receipt.php
@@ -23,18 +23,31 @@ class Receipt extends BaseController
public function lists(): string
{
+ $usr_id = $this->request->getGet('usr_id') ?: '';
+ $sBonbu = $this->request->getGet('bonbu') ?: '';
+ $sTeanm = $this->request->getGet('dept_sq') ?: '';
+
$codes = $this->codeModel->getCodeLists(['NHN_DEAL_TYPE', 'CP_ID', 'ARTICLE_TYPE', 'VRFCREQ_WAY', 'STEP_VERIFICATION']); // 코드조회
$sido = $this->model->getAreaList(); // 지역조회
$bonbu = $this->model->getBonbuList();
$team = $this->model->getTeamList();
$user = $this->model->getUserList();
+
$this->data['sido'] = $sido;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
$this->data['codes'] = $codes;
+ if (!empty($usr_id)) {
+ $srchUser = $this->model->getSrchUserInfo($usr_id);
+ $this->data['srchUser'] = $srchUser;
+ }
+
+ $this->data['sBonbu'] = $sBonbu;
+ $this->data['sTeanm'] = $sTeanm;
+
return view("pages/article/receipt/lists", $this->data);
}
diff --git a/app/Models/article/ReceiptModel.php b/app/Models/article/ReceiptModel.php
index 0bb1ece..3ca1bb5 100644
--- a/app/Models/article/ReceiptModel.php
+++ b/app/Models/article/ReceiptModel.php
@@ -116,6 +116,19 @@ class ReceiptModel extends Model
return $query->getResultArray();
}
+ public function getSrchUserInfo($usr_id)
+ {
+ $sql = "SELECT a.usr_sq, a.usr_id, b.dept_sq, b.pdept_sq FROM users a
+ JOIN departments b ON b.dept_sq = a.dept_sq
+ WHERE a.usr_id = ? AND a.use_yn = 'Y'";
+
+ $data = [$usr_id];
+ $query = $this->db->query($sql, $data);
+ $row = $query->getRowArray();
+
+ return $row;
+ }
+
/**
* 부서검색(상세)
*/
diff --git a/app/Views/layouts/sidebar.php b/app/Views/layouts/sidebar.php
index 7f04196..c172883 100644
--- a/app/Views/layouts/sidebar.php
+++ b/app/Views/layouts/sidebar.php
@@ -39,7 +39,7 @@
$serverIp = $_SERVER['SERVER_ADDR'] ?? '';
// 개발 서버
- $devServers = ['192.168.200.8', '192.168.10.231'];
+ $devServers = ['192.168.200.8', '192.168.10.231', '172.18.0.5'];
// 도커 테스트 서버
$dockerServers = ['172.18.0.2'];
@@ -58,7 +58,7 @@
if (in_array($serverIp, $devServers, true)) {
// 개발
- echo "
";
+ echo "개발";
} elseif (in_array($serverIp, $dockerServers, true)) {
// 도커
@@ -80,8 +80,6 @@
echo "{$serverName}";
}
-
-
?>
diff --git a/app/Views/pages/article/receipt/lists.php b/app/Views/pages/article/receipt/lists.php
index 6014ed9..68b2dce 100644
--- a/app/Views/pages/article/receipt/lists.php
+++ b/app/Views/pages/article/receipt/lists.php
@@ -109,7 +109,6 @@ $usr_nm = session('usr_nm');