Merge remote-tracking branch '备份/dev' into dev

This commit is contained in:
wangliwen 2022-10-18 11:18:24 +08:00
commit 17cd5900f8
1 changed files with 2 additions and 2 deletions

View File

@ -1647,7 +1647,7 @@
MATCH (type) AGAINST ( '应用资源' IN BOOLEAN MODE) MATCH (type) AGAINST ( '应用资源' IN BOOLEAN MODE)
UNION UNION
SELECT SELECT
( CASE tda.attr_value WHEN '智能算法' THEN '组件' WHEN '图层服务' THEN '图层' ELSE '其他' END ) AS "type", ( CASE tda.attr_value WHEN '开发组件' THEN '组件' WHEN '图层服务' THEN '图层' ELSE '其他' END ) AS "type",
COUNT( tdr.id ) AS "count" COUNT( tdr.id ) AS "count"
FROM FROM
tb_data_resource tdr, tb_data_resource tdr,
@ -1659,7 +1659,7 @@
AND tdr.dept_id = #{deptId} AND tdr.dept_id = #{deptId}
AND MATCH (tdr.type) AGAINST ( '组件服务' IN BOOLEAN MODE) AND MATCH (tdr.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
AND tda.attr_type = '组件类型' AND tda.attr_type = '组件类型'
AND tda.attr_value IN ( '智能算法', '图层服务' ) AND tda.attr_value IN ( '开发组件', '图层服务' )
GROUP BY GROUP BY
tda.attr_value tda.attr_value
</select> </select>