jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-09-28 15:23:05 +08:00
parent add8cf812e
commit 47887ae5ce
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
View File

@ -140,11 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join wx_menu_config_role smcr on smcr.smcid = smc.id left join wx_menu_config_role smcr on smcr.smcid = smc.id
left join sys_user_role ur on ur.role_id = smcr.role_id left join sys_user_role ur on ur.role_id = smcr.role_id
where smc.del_flag = 0 where smc.del_flag = 0
<<<<<<< .mine
<if test="currentUserId != null"> and ur.user_id = #{currentUserId}</if> <if test="currentUserId != null"> and ur.user_id = #{currentUserId}</if>
=======
and (ur.user_id = #{currentUserId} or smc.menu_identi='GRQMPZ')
>>>>>>> .theirs
<if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if> <if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
<if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if> <if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
order by smc.menu_sort asc order by smc.menu_sort asc