From 314aeb39f049f26d02611d8a426a2322c7ccfac0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 21:11:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
index 2ce5c77..465995d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
@@ -17,6 +17,7 @@
         region."p_ad_code" AS "parent_id",
         region."ad_name" AS "title",
         region."ad_code" AS "value",
+        region."ad_grad" AS "adGrad",
         region."ad_code" AS "key",
         ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM "SJZT_MD"."att_ad_base" WHERE "p_ad_code" = region."ad_code" ) AS "has_children"
         FROM
@@ -35,4 +36,28 @@
         </where>
         ORDER BY region."ad_code"
     </select>
+
+    <select id="selectAttAdBaseTree" resultType="cn.gistack.common.node.TreeNode">
+        SELECT
+        region."ad_code" AS "id",
+        region."p_ad_code" AS "parent_id",
+        region."ad_name" AS "name",
+        region."ad_grad" AS "level",
+        ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM "SJZT_MD"."att_ad_base" WHERE "p_ad_code" = region."ad_code" ) AS "has_children"
+        FROM
+        "SJZT_MD"."att_ad_base" region
+        <where>
+            <if test="param1!=null">
+                and region."p_ad_code" = #{param1}
+            </if>
+            <if test="param2.code!=null and param2.code!=''">
+                and region."ad_code" like concat(concat('%', #{param2.code}),'%')
+            </if>
+            <if test="param2.name!=null and param2.name!=''">
+                and region."ad_name" like concat(concat('%', #{param2.name}),'%')
+            </if>
+            and region."ad_grad" != 4
+        </where>
+        ORDER BY region."ad_code"
+    </select>
 </mapper>

--
Gitblit v1.9.3