Merge branch 'master' into docker_package
This commit is contained in:
commit
9b0cbc88e6
|
@ -307,7 +307,7 @@
|
|||
LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND
|
||||
del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
|
||||
LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND
|
||||
user_id = #{dto.creator} GROUP BY resource_id ) trcar
|
||||
user_id = #{userId} GROUP BY resource_id ) trcar
|
||||
ON tdr.id = trcar.resource_id
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
|
|
Loading…
Reference in New Issue