wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-19 17:09:44 +08:00
parent 22f897ddb9 b428b74e90
commit 305183cf9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1612,7 +1612,7 @@
<select id="getCIMApplyApplicationList" resultType="java.util.Map">
SELECT
tdr.id,
tdr.NAME,
tdr.name,
tdr.description,
tda.attr_value AS "pic",
tdr.create_date
@ -1640,10 +1640,10 @@
AND (b.attr_type = '组件类型' AND b.attr_value = '图层服务' ) AND b.del_flag = 0
) m
INNER JOIN tb_data_attr b ON m.id = b.data_resource_id
AND b.attr_type = '应用领域' AND LOCATE(#{type},b.attr_value) AND b.del_flag = 0
AND b.attr_type = '分类' AND LOCATE(#{type},b.attr_value) AND b.del_flag = 0
)
SELECT A.*,c.attr_value as link FROM A INNER JOIN tb_data_attr c ON A.id = c.data_resource_id
AND c.attr_type = '图层缩略图' AND c.del_flag = 0
SELECT A.*,IFNULL(c.attr_value,'') as link FROM A LEFT JOIN tb_data_attr c ON A.id = c.data_resource_id
AND c.attr_type = '图层缩略图' AND c.del_flag = 0
</select>
<select id="cimAssemblyResources" resultType="java.util.Map">