From 0645153dfa233b51a749db73f9bd5a8c5127c595 Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 24 七月 2023 09:27:53 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

---
 src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml
index a97d635..7b16e76 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/ElementManagementMapper.xml
@@ -39,12 +39,50 @@
   </select>
   
   
-  <select id="getElementTree" resultType="java.util.Map">
+ <!-- <select id="getElementTree" resultType="java.util.Map">
   	select DISTINCT t.label,t.mt,t.type,t.pid,t.value,(case when (t.keyw is null and t.type>0) then  1 else  0 end ) as isLeaf from(
 	select t1.mt,t1.label,t1.type,t1.value,t1.pid,t2.label as keyw
 	from (select name as label,menu_type as mt,type,id as value,parent_id as pid from element_management WHERE valid_flag=1) t1  left join (select name as label,type,id as value,	  parent_id as pid from element_management WHERE valid_flag=1) t2
 	on t1.value=t2.pid) t
-  </select>
+  </select>-->
+  <select id="getElementTree" resultType="java.util.Map">
+    SELECT DISTINCT
+      t.label,
+      t.mt,
+      t.type,
+      t.pid,
+      t.point,
+      t.value,
+      (CASE
 
+         WHEN ( t.keyw IS NULL AND t.type > 0 ) THEN
+           1 ELSE 0
+        END ) AS isLeaf
+    FROM
+      (
+        SELECT
+          t1.mt,
+          t1.label,
+          t1.type,
+          t1.value,
+          t1.pid,
+          t1.point,
+          t2.label AS keyw
+        FROM
+          ( SELECT
+              name AS label,
+              menu_type AS mt,
+              type,
+              id AS value,
+			  parent_id AS pid,
+			  point
+            FROM
+              element_management
+            WHERE
+              valid_flag = 1
+          ) t1
+            LEFT JOIN ( SELECT name AS label, type, id AS value, parent_id AS pid FROM element_management WHERE valid_flag = 1 ) t2 ON t1.value= t2.pid
+      ) t
+  </select>
 
 </mapper>

--
Gitblit v1.9.2