From 3594a911312b92561b08c478ef0319cf1ae2b0d8 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 2a8d27f..088dc3b 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -16,7 +16,7 @@
<result property="name" column="father"/>
</resultMap>
<select id="selectAllTechTem" resultMap="selectAllTechTemMap">
- select e.name elname,
+ select e.name elname,
father
from mom_ocean.technology_template t,
mom_ocean.element e,
@@ -24,6 +24,7 @@
where e.id = et.element_id
and t.id = tech_tem_id
and t.state = 1
+ and et.state=1
and type=#{type}
<if test="message!=null and message!=''">
and father like concat('%',#{message},'%')
@@ -49,10 +50,10 @@
<!--鏍规嵁id鏌ョ湅璇︽儏-->
<resultMap id="selecTechByIdMap" type="map">
- <id property="id" column="type"/>
- <result property="name" column="father"/>
+ <id property="type" column="type"/>
+ <result property="father" column="father"/>
<result property="name" column="name"/>
- <result property="name" column="device_group"/>
+ <result property="deviceGroup" column="device_group"/>
<collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
</resultMap>
<resultMap id="selecTechByIdsMap" type="map">
--
Gitblit v1.9.3