From fba48dfd39f2d5bd0cca11d06821cd9516f3f47e Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Wed, 9 Apr 2025 15:34:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86-=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=89=E7=85=A7=E9=83=A8=E9=97=A8=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/BusinessAlertMapper.xml   | 165 +++++++++++-------
 1 file changed, 100 insertions(+), 65 deletions(-)

diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index 4377ea6..df531bc 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -135,20 +135,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listDepartAlert" resultType="java.util.Map">
-        WITH RECURSIVE districts AS (
-        SELECT dept_id, dept_name,tenant_id FROM dk_cloud.sys_dept <where>
-        <if test="param.deptId != null and param.deptId != ''">
-            parent_id = #{param.deptId}
-        </if>
-        <if test="param.deptId == null or param.deptId == ''">
-            parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0')
-        </if>
-    </where>
-        ),
-        sub_depts AS (
-        -- 第一级子部门（包含 dept_name）
-        SELECT dept_id, dept_name, parent_id, tenant_id
-        FROM dk_cloud.sys_dept
+        WITH RECURSIVE sub_depts AS (
+        SELECT
+        dept_id,
+        dept_name,
+        parent_id,
+        tenant_id
+        FROM
+        dk_cloud.sys_dept
         <where>
             <if test="param.deptId != null and param.deptId != ''">
                 parent_id = #{param.deptId}
@@ -158,29 +152,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         UNION ALL
-        -- 递归查询下级部门（同样包含 dept_name）
-        SELECT d.dept_id, d.dept_name, d.parent_id, d.tenant_id
-        FROM dk_cloud.sys_dept d
+        -- 递归查询：获取所有下级部门
+        SELECT
+        d.dept_id,
+        d.dept_name,
+        d.parent_id,
+        d.tenant_id
+        FROM
+        dk_cloud.sys_dept d
         INNER JOIN sub_depts st ON d.parent_id = st.dept_id
         ),
-                       warning_summary AS (
-                           SELECT
-                               d.dept_id AS district_id,
-                               COUNT( ba.id ) AS total_warnings
-                           FROM
-                               business_alert ba
-                               INNER JOIN sub_depts d ON ba.dept_id = d.dept_id
-                           <include refid="searchSql"></include>
-                           GROUP BY
-                               d.dept_id
-                       )
+        -- 获取直接子部门（用于最终显示）
+        districts AS (
         SELECT
-            d.dept_id deptId,
-            d.dept_name  deptName,
-            COALESCE ( w.total_warnings, 0 ) AS total
+        dept_id,
+        dept_name,
+        parent_id,
+        tenant_id
         FROM
-            districts d
-                LEFT JOIN warning_summary w ON d.dept_id = w.district_id
+        dk_cloud.sys_dept
+        <where>
+            <if test="param.deptId != null and param.deptId != ''">
+                parent_id = #{param.deptId}
+            </if>
+            <if test="param.deptId == null or param.deptId == ''">
+                parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0')
+            </if>
+        </where>
+        ),
+        warning_summary AS (
+        SELECT
+        dc.dept_id AS district_id,
+        COUNT(ba.id) AS total_warnings
+        FROM
+        districts dc
+        LEFT JOIN sub_depts sd ON sd.parent_id = dc.dept_id OR sd.dept_id = dc.dept_id
+        LEFT JOIN business_alert ba ON ba.dept_id = sd.dept_id
+        <include refid="searchSql"></include>
+        GROUP BY
+        dc.dept_id
+        )
+        SELECT
+        dc.dept_id deptId,
+        dc.dept_name deptName,
+        COALESCE(ws.total_warnings, 0) AS total
+        FROM
+        districts dc
+        LEFT JOIN warning_summary ws ON dc.dept_id = ws.district_id
     </select>
 
     <select id="listMonthAlertStatus" resultType="java.util.Map">
@@ -206,20 +224,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listDepartAlertStatus" resultType="java.util.Map">
-        WITH RECURSIVE districts AS (
-        SELECT dept_id, dept_name,tenant_id FROM dk_cloud.sys_dept <where>
-        <if test="param.deptId != null and param.deptId != ''">
-            parent_id = #{param.deptId}
-        </if>
-        <if test="param.deptId == null or param.deptId == ''">
-            parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0')
-        </if>
-    </where>
-        ),
-        sub_depts AS (
-        -- 第一级子部门（包含 dept_name）
-        SELECT dept_id, dept_name, parent_id, tenant_id
-        FROM dk_cloud.sys_dept
+        WITH RECURSIVE sub_depts AS (
+        SELECT
+        dept_id,
+        dept_name,
+        parent_id,
+        tenant_id
+        FROM
+        dk_cloud.sys_dept
         <where>
             <if test="param.deptId != null and param.deptId != ''">
                 parent_id = #{param.deptId}
@@ -229,36 +241,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         UNION ALL
-        -- 递归查询下级部门（同样包含 dept_name）
-        SELECT d.dept_id, d.dept_name, d.parent_id, d.tenant_id
-        FROM dk_cloud.sys_dept d
+        -- 递归查询：获取所有下级部门
+        SELECT
+        d.dept_id,
+        d.dept_name,
+        d.parent_id,
+        d.tenant_id
+        FROM
+        dk_cloud.sys_dept d
         INNER JOIN sub_depts st ON d.parent_id = st.dept_id
         ),
+        -- 获取直接子部门（用于最终显示）
+        districts AS (
+        SELECT
+        dept_id,
+        dept_name,
+        parent_id,
+        tenant_id
+        FROM
+        dk_cloud.sys_dept
+        <where>
+            <if test="param.deptId != null and param.deptId != ''">
+                parent_id = #{param.deptId}
+            </if>
+            <if test="param.deptId == null or param.deptId == ''">
+                parent_id in (select dsd.dept_id from dk_cloud.sys_dept dsd where dsd.parent_id = '0')
+            </if>
+        </where>
+        ),
         warning_summary AS (
         SELECT
-        d.dept_id AS district_id,
+        dc.dept_id AS district_id,
         COUNT(ba.id) AS total_warnings,
-        IFNULL(SUM(handle_type = 'waiting'), 0) AS todoCount,
-        IFNULL(SUM(handle_type = 'finish'), 0) AS finishCount,
+        IFNULL(SUM(ba.handle_type = 'waiting'), 0) AS todoCount,
+        IFNULL(SUM(ba.handle_type = 'finish'), 0) AS finishCount,
         IFNULL(SUM(ba.handle_type = 'cancel'), 0) AS cancelCount
         FROM
-        business_alert ba
-        INNER JOIN sub_depts d ON ba.dept_id = d.dept_id
-        AND ba.handle_type != 'verify'
+        districts dc
+        LEFT JOIN sub_depts sd ON sd.parent_id = dc.dept_id OR sd.dept_id = dc.dept_id
+        LEFT JOIN business_alert ba ON ba.dept_id = sd.dept_id
         <include refid="searchSql"></include>
         GROUP BY
-        d.dept_id
+        dc.dept_id
         )
         SELECT
-        d.dept_id deptId,
-        d.dept_name deptName,
-        IFNULL(w.total_warnings, 0) AS total,
-        IFNULL(w.todoCount, 0) AS todoCount,
-        IFNULL(w.finishCount, 0) AS finishCount,
-        IFNULL(w.cancelCount, 0) AS cancelCount
+        dc.dept_id deptId,
+        dc.dept_name deptName,
+        COALESCE(ws.total_warnings, 0) AS total,
+        IFNULL(ws.todoCount, 0) AS todoCount,
+        IFNULL(ws.finishCount, 0) AS finishCount,
+        IFNULL(ws.cancelCount, 0) AS cancelCount
         FROM
-        districts d
-        LEFT JOIN warning_summary w ON d.dept_id = w.district_id
+        districts dc
+        LEFT JOIN warning_summary ws ON dc.dept_id = ws.district_id
     </select>
 
     <select id="countAlertCompare" resultType="java.util.Map">

From 9209eb7ef0d5ec6170bc2f8c78acb0a1b3cf3c9e Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Thu, 10 Apr 2025 14:26:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=BE=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/BusinessAlertMapper.xml          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index df531bc..1a80cae 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -68,14 +68,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                        uu.processed_by approver,
                                        a.id flowTaskId,
                                        b.id instanceId,
-                                       fn.permissions,
+                                       fnData.permissions,
                                        a.node_type
                           from dk_business.business_alert ba
                                    inner join dk_workflow.flow_instance b on ba.id = b.business_id
                                    left join dk_workflow.flow_task a on a.instance_id = b.id
                                    left join dk_workflow.flow_user uu on uu.associated = a.id
                                    left join dk_workflow.flow_definition c on a.definition_id = c.id
-                                   left join dk_workflow.flow_node fn on fn.node_code = b.node_code
+                                   LEFT JOIN LATERAL (
+                              SELECT
+                                  JSON_UNQUOTE(JSON_EXTRACT(fn.ext, '$[0].value')) AS buttonPermission,
+                                  fn.permissions
+                              FROM dk_workflow.flow_node fn
+                              WHERE fn.node_code = b.node_code
+                                and fn.del_flag = '0'
+                                  LIMIT 1
+                        ) AS fnData ON TRUE
                 where a.node_type = 1
               and a.del_flag = '0'
               and uu.del_flag = '0'

From eeaff7532099e9f167dae61d73bd4c8efbb8d0ee Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Thu, 10 Apr 2025 14:28:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=BE=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/BusinessAlertMapper.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index 1a80cae..fecbdb2 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -77,7 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                    left join dk_workflow.flow_definition c on a.definition_id = c.id
                                    LEFT JOIN LATERAL (
                               SELECT
-                                  JSON_UNQUOTE(JSON_EXTRACT(fn.ext, '$[0].value')) AS buttonPermission,
                                   fn.permissions
                               FROM dk_workflow.flow_node fn
                               WHERE fn.node_code = b.node_code

From 1a5f2a1f4e234aa52d77dbe61ceb71019f436085 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Thu, 10 Apr 2025 14:36:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=BE=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/business/BusinessAlertMapper.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index fecbdb2..2c11122 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -79,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                               SELECT
                                   fn.permissions
                               FROM dk_workflow.flow_node fn
-                              WHERE fn.node_code = b.node_code
+                              WHERE
+                                fn.node_code = b.node_code
+                                and fn.definition_id = c.id
                                 and fn.del_flag = '0'
                                   LIMIT 1
                         ) AS fnData ON TRUE