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-11-01 13:42:00 +08:00
parent 70ad06f8cd e6263780ee
commit e4521cbc97
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -1917,7 +1917,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
CompletableFuture<Void> all = CompletableFuture.allOf(jcss, hkt, sphy);
all.join();
return new LinkedHashMap(){{
return new LinkedHashMap() {{
put("视频资源", resultMap.get("视频资源"));
put("会客厅", resultMap.get("会客厅"));
put("视频会议", resultMap.get("视频会议"));

3
renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml
View File

@ -25,6 +25,7 @@
</select>
<update id="updateApplyState">
update sys_notice set apply_state = #{applyState} where receiver_type_ids like concat('%', #{userId}, '%') and apply_id=#{applyId}
update sys_notice set apply_state = #{applyState} where receiver_type_ids like concat('%', #{userId}, '%') and
apply_id=#{applyId}
</update>
</mapper>

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

@ -2055,8 +2055,10 @@
FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
<![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
ON tdr.id=tda.data_resource_id
LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on sdd.dict_type_id=tdc.link_value
where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON dict.dict_label=tda.attr_value
LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on
sdd.dict_type_id=tdc.link_value
where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON
dict.dict_label=tda.attr_value
WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
GROUP BY tda.attr_value
ORDER BY ANY_VALUE(IFNULL(dict.sort, 9999)) ASC

2
renren-admin/src/main/resources/mapper/sys/SysDeptDao.xml
View File

@ -7,7 +7,7 @@
select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
where 1 = 1 AND name != '访客部门'
<if test="deptIdList != null">
AND t1.id in
AND t1.id in
<foreach item="id" collection="deptIdList" open="(" separator="," close=")">
#{id}
</foreach>