From d21415ff7cb74a9c4b358c0a3a8028931e27c605 Mon Sep 17 00:00:00 2001
From: liam <2075995406@qq.com>
Date: Fri, 25 Aug 2023 16:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java | 6 +++---
 .../resources/mapper/screen/ZongzhiScreenSaftyMapper.xml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
index 8956025..a826177 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiTbAreaResponse.java
@@ -19,10 +19,10 @@ public class ZongzhiTbAreaResponse {
     private double pt;
 
     /**
-     * 属地
+     * 属地ID
      */
-    @ApiModelProperty(value = "属地")
-    private String locationName;
+    @ApiModelProperty(value = "属地ID")
+    private String areaId;
 
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
index 83fa048..4e3bb5c 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
@@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from tc_idc_unit
     </select>
     <select id="getTbArea" resultType="com.ruoyi.screen.domain.response.ZongzhiTbAreaResponse">
-        SELECT ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, count(*) as count,location_name as locationName
+        SELECT ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, count(*) as count,area_id as areaId
         from tc_tb where tb_type='1'
-        group by location_name
+        group by area_id
     </select>
     <select id="getTbDept" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptResponse">
         SELECT COUNT(*) AS count, dep_name