From c9eab27d4de85c0b628dbe069e503d49811915fe Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Mon, 23 Oct 2023 14:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E7=BC=96?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/tcZz/mapper/ScreenMapper.java   |  2 +-
 .../com/ruoyi/tcZz/service/ScreenService.java |  2 +-
 .../tcZz/service/impl/ScreenServiceImpl.java  |  2 +-
 .../mapper/tcZz/netManage/ScreenMapper.xml    | 28 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
index 6373ff81..98dffafe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/ScreenMapper.java
@@ -91,5 +91,5 @@ public interface ScreenMapper {
      *
      * @return
      */
-    ScreenDepartmentResponse getScreenDepartment();
+    List<ScreenDepartmentResponse> getScreenDepartment();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
index ddf82478..f3f65766 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java
@@ -87,5 +87,5 @@ public interface ScreenService {
      *
      * @return
      */
-    ScreenDepartmentResponse getScreenDepartment();
+    List<ScreenDepartmentResponse> getScreenDepartment();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
index 410281da..9ac0e3e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java
@@ -66,7 +66,7 @@ public class ScreenServiceImpl implements ScreenService {
     }
 
     @Override
-    public ScreenDepartmentResponse getScreenDepartment() {
+    public  List<ScreenDepartmentResponse> getScreenDepartment() {
         return screenMapper.getScreenDepartment();
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
index 8623a5b5..0ffd2672 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
@@ -6,12 +6,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getScreenSupervision" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSupervisionResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1 and area_id=1) count,
-             (SELECT COUNT(*) AS count1 FROM tc_dbdw WHERE isStatus = 1 and area_id=1) count1,
-             (SELECT COUNT(*) AS count2 FROM tc_zfwz WHERE isStatus = 1 and area_id=1) count2,
-             (SELECT COUNT(*) AS count3 FROM tc_jgdw WHERE isStatus = 1 and area_id=1 and type =1) count3,
-               (SELECT COUNT(*) AS count5 FROM tc_jgdw WHERE isStatus = 1 and area_id=1 and type =2) count5,
-             (SELECT COUNT(*) AS count4 FROM tc_idcdw WHERE isStatus = 1 and area_id=1) count4;
+        FROM (SELECT COUNT(*) AS count FROM tc_dbxt WHERE isStatus=1) count,
+             (SELECT COUNT(*) AS count1 FROM tc_dbdw WHERE isStatus = 1) count1,
+             (SELECT COUNT(*) AS count2 FROM tc_zfwz WHERE isStatus = 1 ) count2,
+             (SELECT COUNT(*) AS count3 FROM tc_jgdw WHERE isStatus = 1  and type =1) count3,
+               (SELECT COUNT(*) AS count5 FROM tc_jgdw WHERE isStatus = 1  and type =2) count5,
+             (SELECT COUNT(*) AS count4 FROM tc_idcdw WHERE isStatus = 1 ) count4;
     </select>
     <select id="getScreenSource" resultType="com.ruoyi.tcZz.domain.reponse.ScreenSourceResponse">
         SELECT *
@@ -21,17 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getScreenOpinionReport" resultType="com.ruoyi.tcZz.domain.reponse.ScreenOpinionReportResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_yqbg where type =1 and isStatus=1 and area_id=1) count,
-	(SELECT COUNT(*) AS count1 FROM tc_yqbg where type=2 and isStatus=1 and area_id=1) count1,
-  (SELECT COUNT(*) AS count2 FROM tc_yqbg where type=3 and isStatus=1 and area_id=1) count2,
-	 (SELECT COUNT(*) AS count3 FROM tc_yqbg where type=4 and isStatus=1 and area_id=1) count3,
-	  (SELECT COUNT(*) AS count4 FROM tc_yqbg where type=5 and isStatus=1 and area_id=1) count4;
+        FROM (SELECT COUNT(*) AS count FROM tc_yqbg where type =1 and isStatus=1) count,
+	(SELECT COUNT(*) AS count1 FROM tc_yqbg where type=2 and isStatus=1 ) count1,
+  (SELECT COUNT(*) AS count2 FROM tc_yqbg where type=3 and isStatus=1 ) count2,
+	 (SELECT COUNT(*) AS count3 FROM tc_yqbg where type=4 and isStatus=1 ) count3,
+	  (SELECT COUNT(*) AS count4 FROM tc_yqbg where type=5 and isStatus=1 ) count4;
     </select>
     <select id="getScreenArticles" resultType="com.ruoyi.tcZz.domain.reponse.ScreenArticlesResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type =1 and isStatus=1 and area_id =1) count,
-	(SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type=2 and isStatus=1 and area_id =1) count1,
-  (SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 and area_id =1) count2;
+        FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type =1 and isStatus=1) count,
+	(SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type=2 and isStatus=1 ) count1,
+  (SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 ) count2;
 
     </select>
     <select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse">