From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index d563fde..21d4c1e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -30,7 +30,10 @@
         SELECT
            id,name,pId,eqid
         FROM
-            sys_catalog
+            sys_catalog where 1 = 1
+        <if test="id!=null">
+            and id = #{id}
+        </if>
 
     </select>
 
@@ -106,8 +109,20 @@
         </if>
     </select>
 
+    <select id="tree" resultMap="treeNodeResultMap">
+        select id, pId as parent_id, name as title, id as "value", id as "key" from sys_catalog
+    </select>
+
     <update id="updateCatalog">
-    update sys_catalog SET name=#{name} where eqid=#{eqid}
-</update>
+    update sys_catalog SET name=#{name},eqid=#{eqid}
+        <if test="pid!=null and pid!=''">
+            ,pId=#{pid}
+        </if>
+     where eqid=#{eqid}
+    </update>
+
+    <insert id="addCatalog">
+       INSERT INTO sys_catalog (name,eqid,pId) VALUES (#{name},#{eqid},#{pid})
+    </insert>
 
 </mapper>

--
Gitblit v1.9.3