diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
index 14f5633b..8e068aad 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
@@ -162,8 +162,32 @@
 
     <select id="searchFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
-        ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),c.area_name AS 'areaName',d.customer_name AS 'customerName'
-        ,d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
+        ,c.area_name AS 'areaName',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
+        ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime'
+        ,di.name AS 'warrantyStatusDesc',d.device_type AS 'deviceType',d.model_no AS 'equipmentModel'
+        ,d.shipment_date AS 'shipmentDate',IF(tf.id IS NULL, false, true) AS 'followed',auc.user_name AS 'cqm'
+        ,t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle',dt.cqm_person_name AS 'cqms',t.handle_name AS 'handle'
+        ,t.description,t.throughput,t.accident_level
+        FROM ticket t
+        LEFT JOIN app_user u ON t.user_id=u.id
+        LEFT JOIN admin_user au ON t.user_id=au.id
+        LEFT JOIN t_base_customer c ON t.agency_company_code=c.agency_company_code
+        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
+        LEFT JOIN dictionary_item di ON d.warranty_state=di.id
+        LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
+        LEFT JOIN admin_user auc ON t.cqm=auc.id
+        LEFT JOIN admin_user auh ON t.current_handle=auh.id
+        LEFT JOIN v_device_part p ON t.component_id=p.id
+        <include refid="adminSearchWhereCondition"/>
+        ORDER BY t.state,t.id DESC
+    </select>
+
+    <select id="searchAllFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
+        SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
+        ,c.area_name AS 'areaName',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
         ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc'
         ,d.device_type AS 'deviceType',d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate'
         ,IF(tf.id IS NULL, false, true) AS 'followed',auc.user_name AS 'cqm',t.solve_time AS 'closeTime'
@@ -184,33 +208,10 @@
         ORDER BY t.state,t.id DESC
     </select>
 
-    <select id="searchAllFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
-        SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
-        ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),c.area_name AS 'areaName',d.customer_name AS 'customerName'
-        ,d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
-        ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc'
-        ,d.device_type AS 'deviceType',d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate'
-        ,IF(tf.id IS NULL, false, true) AS 'followed',auc.user_name AS 'cqm',t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle'
-        ,dt.cqm_person_name AS 'cqms',t.handle_name AS 'handle',t.description,t.throughput,t.accident_level
-        FROM ticket t
-        LEFT JOIN app_user u ON t.user_id=u.id
-        LEFT JOIN admin_user au ON t.user_id=au.id
-        LEFT JOIN t_base_customer c ON t.agency_company_code=c.agency_company_code
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
-        LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
-        LEFT JOIN dictionary_item di ON d.warranty_state=di.id
-        LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
-        LEFT JOIN admin_user auc ON t.cqm=auc.id
-        LEFT JOIN admin_user auh ON t.current_handle=auh.id
-        LEFT JOIN v_device_part p ON t.component_id=p.id
-        <include refid="adminSearchWhereCondition"/>
-        ORDER BY t.state,t.id DESC
-    </select>
-
     <select id="searchFromAdminAndFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
-        ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),c.area_name AS 'areaName',d.customer_name AS 'customerName'
-        ,d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
+        ,c.area_name AS 'areaName',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
         ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc'
         ,d.device_type AS 'deviceType',d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate',true AS 'followed'
         ,auc.user_name AS 'cqm',t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle',dt.cqm_person_name AS 'cqms'
@@ -232,8 +233,8 @@
 
     <select id="searchAllFromAdminAndFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
-        ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),c.area_name AS 'areaName',d.customer_name AS 'customerName'
-        ,d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
+        ,c.area_name AS 'areaName',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
         ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc'
         ,true AS 'followed',auc.user_name AS 'cqm',t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle'
         ,dt.cqm_person_name AS 'cqms',t.handle_name AS 'handle',t.description,t.throughput,t.accident_level
@@ -266,8 +267,8 @@
 
     <select id="searchByFavouritesId" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
-        ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),c.area_name AS 'areaName',d.customer_name AS 'customerName'
-        ,d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
+        ,c.area_name AS 'areaName',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',t.device_no AS 'deviceNo'
         ,t.use_time AS 'useTime',t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc'
         ,d.device_type AS 'deviceType',d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate',true AS 'followed'
         ,auc.user_name AS 'cqm',t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle',dt.cqm_person_name AS 'cqms'