|
@@ -56,14 +56,16 @@
|
|
|
</where>
|
|
|
group by COMPANY_ID) a
|
|
|
full join
|
|
|
- (select COMPANY_ID_ as companyId, count(*) album from KM_ALBUM_INFO
|
|
|
+ (select users.COMPANY_ID_ as companyId, count(*) album from KM_ALBUM_INFO album
|
|
|
+ join LEARNING_USER_DEV.OS_USER users
|
|
|
+ on album.UPDATE_BY_ = users.USER_ID_
|
|
|
<where>
|
|
|
<if test="firstDay != null and lastDay != null">
|
|
|
- and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') >= #{firstDay}
|
|
|
- and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') <= #{lastDay}
|
|
|
+ and TO_CHAR(album.CREATE_TIME_,'yyyy-mm-dd') >= #{firstDay}
|
|
|
+ and TO_CHAR(album.CREATE_TIME_,'yyyy-mm-dd') <= #{lastDay}
|
|
|
</if>
|
|
|
</where>
|
|
|
- group by COMPANY_ID_) b
|
|
|
+ group by users.COMPANY_ID_) b
|
|
|
using (companyId)
|
|
|
)
|
|
|
order by album desc
|