diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java
index 75dbc8f..347df98 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcTownController.java
@@ -115,4 +115,5 @@ public class TcTownController extends BaseController {
         List<TcTown> tcTowns = tcTownService.selectTcTownList(tcTown);
         return AjaxResult.success(tcTownService.buildDeptTreeSelect(tcTowns));
     }
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml
index d5c823e..273dff6 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenNetworkEcologyMapper.xml
@@ -17,9 +17,14 @@
     </select>
     <select id="getAppraiserComplete"
             resultType="com.ruoyi.screen.domain.response.ZongzhiAppraiserCompleteResponse">
-        SELECT ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, b.name
-        FROM `tc_network_evaluate` a
-                 left join tc_town b on a.area_id = b.id
-        GROUP BY a.area_id
+        select ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt, b.name from(
+        SELECT
+        CASE
+        WHEN LOCATE(',', area_id) = 0 THEN TRIM(TRAILING ']' FROM SUBSTR(area_id, LOCATE('[', area_id) + 1))
+        ELSE TRIM(TRAILING ']' FROM SUBSTRING_INDEX(area_id, ',', -1))
+        END AS area_id
+        FROM tc_network_evaluate)s left join tc_town b on s.area_id = b.id
+        GROUP BY s.area_id
+
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
index 4e3bb5c..ebc42b2 100644
--- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.screen.mapper.ZongzhiScreenSaftyMapper">
 
 
@@ -26,13 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getUnAttackTop" resultType="com.ruoyi.screen.domain.response.ZongzhiUnAttackResponse">
-        select attacked_ip as attackedIp, attacked_ip_region as attackIpRegion, count(*)as count, ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 1) AS pt
+        select attacked_ip as attackedIp, attacked_ip_region as attackIpRegion, count(*)as count, ROUND(COUNT(*) * 100.0
+        / SUM(COUNT(*)) OVER (), 1) AS pt
         from tc_safety_detection
         GROUP BY attacked_ip
         ORDER BY count desc limit 5
     </select>
     <select id="getSafetyHazard" resultType="com.ruoyi.screen.domain.response.ZongzhiSafetyHazardResponse">
-        select type,count(*) as count  from tc_safety_danger GROUP BY type
+        select type,count(*) as count from tc_safety_danger GROUP BY type
     </select>
     <select id="getHazardDisposal" resultType="com.ruoyi.screen.domain.response.ZongzhiHazardDisposalResponse">
         select risk_name as riskName, level, unit_name AS unitName, risk_source AS riskSource
@@ -57,9 +58,27 @@ 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,area_id as areaId
-        from tc_tb where tb_type='1'
-        group by area_id
+        SELECT
+        s.area_id AS areaId,
+        ROUND( COUNT( * ) * 100.0 / SUM( COUNT( * ) ) OVER ( ), 1 ) AS pt,
+        count( * ) AS count
+        FROM
+        (
+        SELECT
+        CASE
+        WHEN
+        LOCATE( ',', area_id ) = 0 THEN
+        TRIM( TRAILING ']' FROM SUBSTR( area_id, LOCATE( '[', area_id ) + 1 ) ) ELSE TRIM( TRAILING ']' FROM
+        SUBSTRING_INDEX( area_id, ',', - 1 ) )
+        END AS area_id
+        FROM
+        tc_tb
+        WHERE
+        tb_type = '1'
+        AND area_id IS NOT NULL
+        ) s
+        GROUP BY
+        s.area_id
     </select>
     <select id="getTbDept" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptResponse">
         SELECT COUNT(*) AS count, dep_name
@@ -70,15 +89,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getmonthList" resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteMonthResponse">
         SELECT COUNT(*) AS count,
-		count(case when state=1 then state else null end) as complete,
-    count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        count(case when state=1 then state else null end) as complete,
+        count(case when state=1 then state else null end) / COUNT(*) AS pt
         FROM`tc_tb`WHERE DATE_FORMAT( tb_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
     </select>
     <select id="getthirdList"
             resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteThirdMonthResponse">
         SELECT COUNT(*) AS count,
-		count(case when state=1 then state else null end) as complete,
-    count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        count(case when state=1 then state else null end) as complete,
+        count(case when state=1 then state else null end) / COUNT(*) AS pt
         FROM `tc_tb` WHERE QUARTER(tb_time)=QUARTER(now());
 
     </select>
@@ -87,18 +106,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteSixResponse">
         SELECT COUNT(*) AS count,
         count(case when state=1 then state else null end) as complete,
-        count(case when state=1 then state else null end) / COUNT(*)  AS pt
-        FROM `tc_tb` WHERE DATE(tb_time) >= DATE_SUB(CURRENT_DATE(), INTERVAL 6 MONTH) and tb_time &lt;= CURRENT_DATE();;
+        count(case when state=1 then state else null end) / COUNT(*) AS pt
+        FROM `tc_tb` WHERE DATE(tb_time) >= DATE_SUB(CURRENT_DATE(), INTERVAL 6 MONTH) and tb_time &lt;=
+        CURRENT_DATE();;
 
     </select>
 
 
-
     <select id="getyearList"
             resultType="com.ruoyi.screen.domain.response.ZongzhiTbDeptCompleteSixResponse">
         SELECT COUNT(*) AS count,
         count(case when state=1 then state else null end) as complete,
-        count(case when state=1 then state else null end) / COUNT(*)  AS pt
+        count(case when state=1 then state else null end) / COUNT(*) AS pt
         FROM `tc_tb` WHERE DATE(tb_time) >= DATE_SUB(CURRENT_DATE(), INTERVAL 1 YEAR) and tb_time &lt;= CURRENT_DATE();;
 
     </select>