From 11c33d3674e2e8d0d1d54e06990a579669b6448f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sat, 23 May 2026 10:12:48 +0800
Subject: [PATCH] =?UTF-8?q?bug-1492=20=E7=A7=BB=E5=8A=A8=E7=A0=B4=E5=92=8C?=
 =?UTF-8?q?=E5=B7=A5=E6=9C=8D=E5=B7=A5=E5=8D=95=E7=9A=84=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E5=88=9B=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=9C=80=E8=A6=81=E5=B0=86=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9A=84=E6=9C=8D=E5=8A=A1=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E5=95=86=E5=85=AC=E5=8F=B8=E5=9B=BA=E5=8C=96=E4=B8=8B=E6=9D=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=9F=9F=E5=AD=97=E6=AE=B5=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=96=E8=BF=99=E4=B8=AA=E5=85=AC=E5=8F=B8=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

客户端
工单列表中，如果是内部用户和终端用户登录，则去掉区域列，如果是主账号登录，则区域显示空，如果是子账号登录，则显示主账号为子账号设置的区域
---
 .../main/resources/mapper/TicketMapper.xml    | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

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'