简柏林 / thingskit · Commits

Commit ffe21a7ad382b58da21d3f8ef8883028b87fc6ca

Authored by 云中非
1 parent 78d62270

fix: 场景联动返回创建者姓名

Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
@@ -40,4 +40,6 @@ public class SceneLinkageDTO extends TenantDTO{ @@ -40,4 +40,6 @@ public class SceneLinkageDTO extends TenantDTO{
40 @ApiModelProperty(value = "执行条件") 40 @ApiModelProperty(value = "执行条件")
41 private List<DoConditionDTO> doConditions; 41 private List<DoConditionDTO> doConditions;
42 42
  43 + private String creatorName;
  44 +
43 } 45 }
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 <result property="updateTime" column="update_time"/> 13 <result property="updateTime" column="update_time"/>
14 <result property="createTime" column="create_time"/> 14 <result property="createTime" column="create_time"/>
15 <result property="creator" column="creator"/> 15 <result property="creator" column="creator"/>
  16 + <result property="creatorName" column="creator_name"/>
16 <collection property="triggers" select="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper.listBySceneId" column="id" /> 17 <collection property="triggers" select="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper.listBySceneId" column="id" />
17 <collection property="doConditions" select="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper.listBySceneId" column="id" /> 18 <collection property="doConditions" select="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper.listBySceneId" column="id" />
18 <collection property="doActions" select="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper.listBySceneId" column="id" /> 19 <collection property="doActions" select="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper.listBySceneId" column="id" />
@@ -23,8 +24,9 @@ @@ -23,8 +24,9 @@
23 </sql> 24 </sql>
24 <select id="getScenePage" resultMap="sceneLinkageMap"> 25 <select id="getScenePage" resultMap="sceneLinkageMap">
25 SELECT 26 SELECT
26 - <include refid="columns"/> 27 + <include refid="columns"/>,su.real_name creator_name
27 FROM iotfs_scene_linkage s 28 FROM iotfs_scene_linkage s
  29 + LEFT JOIN sys_user su ON su.id = s.creator
28 LEFT JOIN iotfs_organization io ON io.id = s.organization_id 30 LEFT JOIN iotfs_organization io ON io.id = s.organization_id
29 <where> 31 <where>
30 <if test="queryMap.tenantId !=null and queryMap.tenantId !=''"> 32 <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">