From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 8d84b52..0f52dc6 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
@@ -29,12 +29,15 @@
( 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
+ left join "SJZT_MD"."att_ad_base" b on (region."p_ad_code" = b."ad_code")
+ left join "SJZT_MD"."att_ad_base" c on (b."p_ad_code" = c."ad_code")
+ left join "SJZT_MD"."att_ad_base" d on (c."p_ad_code" = d."ad_code")
<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(#{param2.code},'%')
+ and concat(region."ad_code",b."ad_code",c."ad_code",d."ad_code") like concat('%',#{param2.code},'%')
</if>
<if test="param2.name!=null and param2.name!=''">
and region."ad_name" like concat('%',#{param2.name},'%')
@@ -57,12 +60,15 @@
( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM YWXT."att_ad_base" WHERE "p_ad_code" = region."ad_code" ) AS "has_children"
FROM
YWXT."att_ad_base" region
+ left join "YWXT"."att_ad_base" b on (region."p_ad_code" = b."ad_code")
+ left join "YWXT"."att_ad_base" c on (b."p_ad_code" = c."ad_code")
+ left join "YWXT"."att_ad_base" d on (c."p_ad_code" = d."ad_code")
<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(#{param2.code},'%')
+ and concat(region."ad_code",b."ad_code",c."ad_code",d."ad_code") like concat('%',#{param2.code},'%')
</if>
<if test="param2.name!=null and param2.name!=''">
and region."ad_name" like concat('%',#{param2.name},'%')
@@ -144,7 +150,10 @@
start with "ad_code" = (select "interior_ad_guid" from SJZT_MD."att_res_base" where "guid" = #{res_cd} )
CONNECT BY PRIOR "p_ad_code" = "ad_code"
)
- and locate(br.role_name,concat('%',#{roleName},'%'))>0
+ and br.role_name in
+ <foreach collection="roleName.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
and bu.phone is not null and bu.phone!=''
</select>
--
Gitblit v1.9.3