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-07-07 19:50:55 +08:00
parent 27e7aa8654 861e5413e5
commit 408920d950
1 changed files with 4 additions and 2 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

@ -76,6 +76,7 @@
<result property="applyCount" column="applyCount"/> <result property="applyCount" column="applyCount"/>
<result property="infoList" column="info_list" <result property="infoList" column="info_list"
typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="total" column="total"/>
</resultMap> </resultMap>
<update id="deleteByIds"> <update id="deleteByIds">
@ -845,7 +846,8 @@
1 = 1 1 = 1
AND su.id = taa.user_id AND su.id = taa.user_id
AND su.dept_id = sd.id AND su.dept_id = sd.id
AND EXISTS ( SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = taa.resource_id AND tb_data_resource.del_flag = 0 ) AND EXISTS ( SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = taa.resource_id AND
tb_data_resource.del_flag = 0 )
GROUP BY GROUP BY
sd.id sd.id
ORDER BY ORDER BY
@ -1047,7 +1049,7 @@
COUNT( tdav.data_resource_id ) AS total COUNT( tdav.data_resource_id ) AS total
FROM FROM
(SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id (SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id
WHERE c.type = #{resourceType} AND c.dept_id = #{id} AND c.del_flag = 0) tdav WHERE c.type = #{resourceType} AND c.dept_id = #{id} AND c.del_flag = 0) tdav
JOIN mysql.help_topic b ON b.help_topic_id &lt; ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, JOIN mysql.help_topic b ON b.help_topic_id &lt; ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
';', '' ) ) + 1 ) ';', '' ) ) + 1 )
WHERE WHERE