From c072ea4dd48d95e0f742b91f795a18c559ae160e Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Thu, 11 Jan 2024 14:10:53 +0800
Subject: [PATCH] merge

---
 wms/crm/crmm01-index.php               | 2 +-
 wms/crm/crmm02-index.php               | 2 +-
 wms/mkt/pricereview-index.php          | 2 +-
 wms/mkt/pricereview_renovate-index.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wms/crm/crmm01-index.php b/wms/crm/crmm01-index.php
index eec91ed0..2ed535b9 100644
--- a/wms/crm/crmm01-index.php
+++ b/wms/crm/crmm01-index.php
@@ -41,7 +41,7 @@ $where .= " and  salesman_name like '$salesman'";
 
 $sql_cmd = sql_myself($user_id, "salesman");
 // max,許紓晴,林慧珊,鄭伊岑
-if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193" || $user_id == "M0149" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") $sql_cmd = "";
+if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193" || $user_id == "M0149" || $user_id == "M0189" || $user_id == "M0061" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04" ) $sql_cmd = "";
 if (!empty($sql_cmd)) $where .= " and " . str_replace("where", "", $sql_cmd);
 /*
 $checkAll = ['p0044', 'M0007'];
diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php
index 92a073d4..17e14a51 100644
--- a/wms/crm/crmm02-index.php
+++ b/wms/crm/crmm02-index.php
@@ -42,7 +42,7 @@ $where .= " and  salesman like '$salesman'";
 $lm_name = empty($_GET['linkman']) ? "%" : $_GET['linkman'];
 $where .= " and  linkman like '$lm_name'";
 $sql_cmd = sql_myself($user_id, "salesman");
-if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0149" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") $sql_cmd = "";  // M0060:Max,鄭伊岑
+if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0061" ||  $user_id == "M0149" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") $sql_cmd = "";  // M0060:Max,鄭伊岑
 if (!empty($sql_cmd)) $where .= " and " . str_replace("where", "", $sql_cmd);
 
 $sql = "SELECT  vol_no,customer,manager,salesman,f_return_content('customer_source',source ) source,
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 90796cfd..c85aac5f 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -65,7 +65,7 @@ $data = array();
 $sql_cmd = sql_myself($user_id, "pricereview_main .creater");
 $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.creater  = '$user_id' and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 // M0024許伃廷,M0107許紓晴,,M0175陳君敏,M0189權限全開
-if ($user_id == "M0024" || $user_id == 'M0026' || $user_id == "M0107" || $user_id == "M0174" || $user_id == "M0175" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") {
+if ($user_id == "M0024" || $user_id == 'M0026' || $user_id == "M0107" || $user_id == "M0174" || $user_id == "M0175" || $user_id == "M0189" || $user_id == "M0061" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") {
     $sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
     $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where create_at >= '2023-01-01 00:00:00' and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 }
diff --git a/wms/mkt/pricereview_renovate-index.php b/wms/mkt/pricereview_renovate-index.php
index 7d371086..3ae6c9a9 100644
--- a/wms/mkt/pricereview_renovate-index.php
+++ b/wms/mkt/pricereview_renovate-index.php
@@ -61,7 +61,7 @@ $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id);
 // M0024許伃廷,M0107許紓晴,M0012李盈瑩權限全開
-if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_id == "M0060" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04" || $user_id == "M0029") {
+if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_id == "M0060" || $user_id == "M0189" || $user_id == "M0061" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04" || $user_id == "M0029") {
     $sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
 }
 if ($user_id == "M0008") {