diff --git a/wms/maintainance_contract_payment_status.php b/wms/maintainance_contract_payment_status.php
index 4c4cda2a..bad4ee04 100644
--- a/wms/maintainance_contract_payment_status.php
+++ b/wms/maintainance_contract_payment_status.php
@@ -5,10 +5,17 @@ include "css/view/wipwhole-index.php";
 // 設置一個空陣列來放資料
 $data = array();
 $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
-$contractno = getContractnoDetails($link, $user_id, $contractno);
+$department_id = accountidToDepartId($user_id);
+$contractno = getContractnoDetails($link, $user_id, $department_id, $contractno);
 
 $sql = "
     SELECT 
+    TOP 1000
+        siam.PersonId,
+        cd.DeptName,
+        -- mcp.PersonName,
+        -- mcp.DeptId,
+        -- mcp.DeptName,
         siamd.RowNo,
         siamd.RowCode,
         siam.BillNo,
@@ -21,10 +28,14 @@ $sql = "
         asim.BillNo AS BillNo3,
         asim.InvoiceName,
         asim.OAmountWithTax,
-        asi.InvoiceNo
+        asi.InvoiceNo 
     FROM salIncomeApplyMaster AS siam -- 收入申請單
     LEFT JOIN salIncomeApplyDetail AS siamd -- 收入申請單明細
     ON siam.BillNo = siamd.BillNo
+    LEFT JOIN comPerson AS cp   -- 員工主檔
+    ON siam.PersonId = cp.PersonId
+    LEFT JOIN  comDepartment AS cd -- 部門主檔
+    ON cp.DeptId = cd.DeptId
     LEFT JOIN (
         SELECT
             acbd.FromRowCode,
@@ -52,7 +63,7 @@ $sql .= "
 $sql .= !empty($contractno) ? " AND siam.BillNo IN ($contractno)" : "";
 $data = $conn->query($sql);
 
-function getContractnoDetails($link, $user_id, $contractno = null)
+function getContractnoDetails($link, $user_id, $department_id, $contractno = null)
 {
     $sql = "
         SELECT
@@ -61,8 +72,13 @@ function getContractnoDetails($link, $user_id, $contractno = null)
         LEFT JOIN con_maintance_examine_apply AS cmea
         ON c.contractno = cmea.vol_no
         WHERE 1 = 1
-        AND cmea.salesman IN (" . getAccountids($link, $user_id) . ")
+        
     ";
+
+    if (!in_array($department_id, ['210', '220', '240'])) {
+        $sql .= " AND cmea.salesman IN (" . getAccountids($link, $user_id) . ")";
+    }
+
     if (!empty($contractno)) {
         $sql .= "
             AND c.contractno = '$contractno'
@@ -171,6 +187,16 @@ function arSellInvoiceMaterial($row)
     }
 }
 
+function checkCollectMonth($row)
+{
+    $CU_EstPayDate = $row['CU_EstPayDate'];
+    if (collect_month(strtotime($CU_EstPayDate)) >= 3) {
+        return "<span class='text-danger'>" . collect_month(strtotime($CU_EstPayDate)) . "</span>";
+    } else {
+        return "<span class=''>" . collect_month(strtotime($CU_EstPayDate)) . "</span>";
+    }
+}
+
 function checkArWriteOffBill($conn, $row)
 {
     $BillNo = $row['BillNo2'];
@@ -295,6 +321,7 @@ if ($data) :
             <thead>
                 <tr>
                     <th style='text-align:center;vertical-align: middle;'>營業人員/契約人員</th>
+                    <th style='text-align:center;vertical-align: middle;'>部門</th>
                     <th style='text-align:center;vertical-align: middle;'>合約號</th>
                     <th style='text-align:center;vertical-align: middle;width:50px;'>標示號</th>
                     <th style='text-align:center;vertical-align: middle;'>電梯編號</th>
@@ -311,9 +338,6 @@ if ($data) :
                     <th style='text-align:center;vertical-align: middle;width:80px;'>發票金額</th>
                     <th style='text-align:center;vertical-align: middle;width:120px;'>發票號碼</th>
                     <th style='text-align:center;vertical-align: middle;'>核銷</th>
-                    <!-- <th style='text-align:center;vertical-align: middle;'>核銷日期</th>
-                    <th style='text-align:center;vertical-align: middle;'>未核銷金額</th>
-                    <th style='text-align:center;vertical-align: middle;'>已核銷金額</th> -->
                 </tr>
             </thead>
             <tbody>
@@ -321,11 +345,14 @@ if ($data) :
                     <tr>
                         <td>
                             <?php
-                            echo getSalesmanNo($link, $row['BillNo']);
+                            echo $row['PersonId'];
                             echo "<br/>";
-                            echo getSalesmanName($link, $row['BillNo']);
+                            echo accountidToName($row['PersonId']);
                             ?>
                         </td>
+                        <td>
+                            <?php echo $row['DeptName']; ?>
+                        </td>
                         <td>
                             <?php echo $row['BillNo']; ?>
                         </td>
@@ -339,7 +366,7 @@ if ($data) :
                             <?php echo date('Y/m/d', strtotime($row['CU_EstPayDate'])); ?>
                         </td>
                         <td>
-                            <?php echo collect_month(strtotime($row['CU_EstPayDate'])); ?>
+                            <?php echo checkCollectMonth($row); ?>
                         </td>
                         <td>
                             <?php echo checkArCheckBillStatus($row); ?>