From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml
index 3e481e7..1120756 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml
@@ -5,16 +5,16 @@
<select id="queryPageList" resultType="cn.gistack.sm.sg.VO.SgGxVO">
select * from YWXT.SG_GX gx where 1=1 and GX_TYPE not in('sgzb','sgys')
<if test="dto.gxType != null and dto.gxType != ''">
- and gx.gx_type LIKE CONCAT('%', #{dto.gxType}, '%')
+ and gx.gx_type = #{dto.gxType}
+ <if test="dto.childTypeList != null and !dto.childTypeList.isEmpty()">
+ or gx.gx_type in
+ <foreach collection="dto.childTypeList" open="(" close=")" separator="," item="id">
+ #{id}
+ </foreach>
+ </if>
</if>
<if test="dto.gxName != null and dto.gxName != ''">
and gx.gx_name LIKE CONCAT('%', #{dto.gxName}, '%')
- </if>
- <if test="dto.childTypeList>0 and dto.childTypeList != null">
- and gx.gx_type in
- <foreach collection="dto.childTypeList" open="(" close=")" separator="," item="id">
- #{id}
- </foreach>
</if>
</select>
<select id="queryStepByIds" resultType="cn.gistack.sm.sg.DO.SgGxStepDO">
@@ -33,6 +33,6 @@
select * from YWXT.SG_GX where id = #{id}
</select>
<select id="childType" resultType="java.lang.String">
- select id from "YWXT"."BLADE_DICT_BIZ" where parent_id = (select id from "YWXT"."BLADE_DICT_BIZ" where dict_key = #{gxType});
+ select dict_key from "YWXT"."BLADE_DICT_BIZ" where parent_id = (select id from "YWXT"."BLADE_DICT_BIZ" where dict_key = #{gxType});
</select>
</mapper>
--
Gitblit v1.9.3