Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

wms/mkt/pricereview-index.php

@@ -91,7 +91,8 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') {
         if (strlen($result[$sign]) > 30 && $sign == 'sign2') {
             $id[] = $result['mid'];
         } else {
-            if (strlen($result[$sign]) != 7 && $sign != 'sign2') {
+            if (strlen($result[$sign]) > 10) {
+
                 $id[] = $result['mid'];
             }
         }
@@ -115,7 +116,7 @@ if ($user_id == "M0060") {
 if (empty($sql_cmd)) $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.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 else $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  contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 
-if (!empty($res_get)) {
+if (!empty($res_get) || $_GET['check'] == 1) {
     $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  contract_new_apply.mid = pricereview_main.id 
@@ -123,6 +124,7 @@ if (!empty($res_get)) {
     $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
     // echo $sql;
 }
+
 $data = mysqli_query($link, $sql);
 
 // 若結案不同意