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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-26 11:23:29 +08:00
parent 0a4172d1bf 088559f089
commit 1fa80e1106
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@
AND tdr.type != '知识库'
AND tdr.type != '赋能案例'
<if test="type != null and type != ''">
AND MATCH (tdr.type) AGAINST ( #{type} IN BOOLEAN MODE)
AND tdr.type = #{type}
</if>
<if test="name != null and name != ''">
AND MATCH (tdr.name) AGAINST ( #{name} IN BOOLEAN MODE)
@ -451,7 +451,7 @@
AND tdr.name LIKE CONCAT( '%', #{dto.name}, '%' )
</if>
<if test="dto.type != null and dto.type != '' ">
AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE)
AND tdr.type = #{dto.type}
</if>
@ -511,7 +511,7 @@
AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE)
</if>
<if test="dto.type != null and dto.type != ''">
AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE)
AND tdr.type = #{dto.type}
</if>
<if test="dto.districtId != null and dto.districtId != ''">
AND tdr.district_id = #{dto.districtId}
@ -543,7 +543,7 @@
AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE)
</if>
<if test="dto.type != null and dto.type != ''">
AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE)
AND tdr.type = #{dto.type}
</if>
<if test="dto.districtId != null and dto.districtId != ''">
AND tdr.district_id = #{dto.districtId}
@ -663,7 +663,7 @@
sys_dept sd
LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource WHERE 1 = 1 AND del_flag = 0
<if test="resourceType != null and resourceType != ''">
AND MATCH (type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
AND type = #{resourceType}
</if>
GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
) temp1
@ -704,7 +704,7 @@
LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource
WHERE 1 = 1 AND del_flag = 0
<if test="resourceType != null and resourceType != ''">
AND MATCH (type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
AND type = #{resourceType}
</if>
GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
LEFT JOIN sys_region sr ON sd.district = sr.id
@ -1076,7 +1076,7 @@
FROM tb_data_resource
WHERE 1 = 1
AND del_flag = 0
AND MATCH (type) AGAINST ( #{type} IN BOOLEAN MODE)
AND type = #{type}
AND type != '赋能案例'
</select>