diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 5f718123..13fcb35e 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -100,6 +100,9 @@
             <where>
                 site in (select site from eam_access_site where username = #{query.userName})
                 and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+                <if test="query.buDesc != null and query.buDesc != ''">
+                    AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+                </if>
                 <if test="query.familyID != null and query.familyID != ''">
                     AND familyID like '%' + #{query.familyID} +'%'
                 </if>
@@ -128,6 +131,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.groupID != null and query.groupID != ''">
                 AND groupID like '%' + #{query.groupID} + '%'
             </if>
@@ -156,6 +162,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.locationID != null and query.locationID != ''">
                 AND locationID like '%' + #{query.locationID} +'%'
             </if>
@@ -189,6 +198,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.manufacturerID != null and query.manufacturerID != ''">
                 AND manufacturerID like '%' + #{query.manufacturerID} +'%'
             </if>
@@ -217,6 +229,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.adminLevelID != null and query.adminLevelID != ''">
                 AND adminLevelID like '%' + #{query.adminLevelID} +'%'
             </if>
@@ -251,6 +266,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.supplierID != null and query.supplierID != ''">
                 AND supplierID like '%' + #{query.supplierID} +'%'
             </if>
@@ -322,6 +340,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.codeNo != null and query.codeNo != ''">
                 AND code_no like '%' + #{query.codeNo} +'%'
             </if>
@@ -478,6 +499,9 @@
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and a.delete_flag = 'N' AND a.function_type = #{query.functionType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( a.site, a.bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.planID != null and query.planID != ''">
                 AND a.plan_id like '%' + #{query.planID} +'%'
             </if>
@@ -707,6 +731,9 @@
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and ea.username = #{query.userName}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( a.site, a.bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.orderNo != null and query.orderNo != ''">
                 AND a.OrderNo like '%' + #{query.orderNo} +'%'
             </if>
@@ -826,6 +853,9 @@
             <where>
                 a.site in (select site from eam_access_site where username = #{query.userName})
                 and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+                <if test="query.buDesc != null and query.buDesc != ''">
+                    AND dbo.get_bu_desc ( a.site, a.bu_no ) = #{query.buDesc}
+                </if>
                 <if test="query.deptArr != null">
                     AND
                     <foreach collection="query.deptArr" item="item" open="(" separator="or" close=")">
@@ -877,6 +907,9 @@
                 fault_type
              FROM eam_defect
             <where>
+                <if test="query.buDesc != null and query.buDesc != ''">
+                    AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+                </if>
                  <if test="query.defectID != null and query.defectID != ''">
                     AND defectID like '%' + #{query.defectID} + '%'
                 </if>
@@ -1953,6 +1986,9 @@
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and ItemType = #{query.itemType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.itemNo != null and query.itemNo != ''">
                 AND ItemNo LIKE '%' + #{query.itemNo}+'%'
             </if>
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index e8b0db75..9e066341 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -50,6 +50,9 @@
         <where>
             eo.site in (select site from eam_access_site where username = #{query.userName})
             and (eo.site + '-' + eo.bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = #{query.userName})
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.objectID != null and query.objectID != ''">
                 AND eo.ObjectID like '%' + #{query.objectID} +'%'
             </if>
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 8dc751e2..1e386138 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -25,6 +25,9 @@
         <where>
             qm.site in (select site from eam_access_site where username = #{query.userName})
             and (qm.site + '-' + qm.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qm.site, qm.bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.methodNo != null and query.methodNo != ''">
                 AND qm.method_no LIKE '%' + #{query.methodNo} +'%'
             </if>
@@ -119,6 +122,9 @@
             epi.site in (select site from eam_access_site where username = #{query.userName})
             and (epi.site + '-' + epi.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and epi.ItemType = #{query.itemType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( epi.site, epi.bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.itemDesc != null and query.itemDesc != ''">
                 AND epi.ItemDesc LIKE '%' + #{query.itemDesc} +'%'
             </if>
@@ -280,6 +286,9 @@
         <where>
             qsip.site in (select site from eam_access_site where username = #{query.userName})
             and (qsip.site + '-' + qsip.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qsip.site, qsip.bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.samplingQtyDesc != null and query.samplingQtyDesc != ''">
                 AND qsiq.sampling_qty_desc LIKE '%' + #{query.samplingQtyDesc}+'%'
             </if>
@@ -388,6 +397,9 @@
         <where>
             qt.site in (select site from eam_access_site where username = #{query.userName})
             and (qt.site + '-' + qt.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qt.site, qt.bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.templateId != null and query.templateId != ''">
                 AND qt.template_id LIKE '%' + #{query.templateId}+'%'
             </if>
@@ -654,6 +666,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.samplingQtyNo != null and query.samplingQtyNo != ''">
                 AND sampling_qty_no LIKE '%' + #{query.samplingQtyNo} + '%'
             </if>
@@ -750,6 +765,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.samplingQtyRankNo != null and query.samplingQtyRankNo != ''">
                 AND sampling_qty_rank_no LIKE '%' + #{query.samplingQtyRankNo}+'%'
             </if>
@@ -846,6 +864,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test="query.samplingLevelNo != null and query.samplingLevelNo != ''">
                 AND sampling_level_no LIKE '%' + #{query.samplingLevelNo}+'%'
             </if>
@@ -950,6 +971,9 @@
             qa.site in (select site from eam_access_site where username = #{query.userName})
             and (qa.site + '-' + qa.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and qa.attribute_type = #{query.attributeType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qa.site, qa.bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.partNo != null and query.partNo != ''">
                 AND qa.attribute_no LIKE '%' + #{query.partNo}+'%'
             </if>
@@ -1209,6 +1233,9 @@
             qa.site in (select site from eam_access_site where username = #{query.userName})
             and (qa.site + '-' + qa.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             and qa.attribute_type = #{query.attributeType}
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( qa.site, qa.bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.familyID != null and query.familyID != ''">
                 AND qa.attribute_no LIKE '%' + #{query.familyID}+'%'
             </if>
@@ -1255,6 +1282,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.samplingProgrammeNo != null and query.samplingProgrammeNo != ''">
                 AND sampling_programme_no LIKE '%' + #{query.samplingProgrammeNo}+'%'
             </if>
@@ -1548,6 +1578,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>
@@ -1863,6 +1896,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>
@@ -2206,6 +2242,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>
@@ -2530,6 +2569,9 @@
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
             and (site + '-' + bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>