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-31 09:48:08 +08:00
parent b015025c40 ce1bce47c5
commit a7489a8033
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,7 @@
1 = 1 1 = 1
AND tda.attr_type = '应用领域' AND tda.attr_type = '应用领域'
AND tda.del_flag = 0 AND tda.del_flag = 0
AND ( attr_value != '' AND attr_value IS NOT NULL ) AND ( attr_value IS NOT NULL AND attr_value != '')
GROUP BY GROUP BY
attr_value attr_value
ORDER BY ORDER BY
@ -1652,7 +1652,7 @@
( (
SELECT a.name,a.id,a.info_list FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id SELECT a.name,a.id,a.info_list FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
WHERE a.dept_id = #{deptid} AND a.del_flag = 0 and MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE) WHERE a.dept_id = #{deptid} AND a.del_flag = 0 and MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
AND (b.attr_type = '组件类型' AND b.attr_value = '图层服务' ) AND b.del_flag = 0 AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '图层服务' IN BOOLEAN MODE)) AND b.del_flag = 0
) m ) m
INNER JOIN tb_data_attr b ON m.id = b.data_resource_id 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
@ -1671,7 +1671,7 @@
a.dept_id = #{deptid} a.dept_id = #{deptid}
AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE) AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
AND a.del_flag = 0 AND a.del_flag = 0
AND (b.attr_type = '组件类型' AND b.attr_value = '智能算法' ) AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '智能算法' IN BOOLEAN MODE))
AND b.del_flag = 0 AND b.del_flag = 0
</select> </select>
</mapper> </mapper>