admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
pengjie 2024-06-05 22:45:39 +08:00
commit 2f4b5da8a5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -41,6 +41,9 @@
INNER JOIN base_menu t3 ON a1.menu_id=t3.menu_id
INNER JOIN base_module t4 ON t3.module_id=t4.module_id
WHERE t1.project_sn=#{projectSn} AND t.user_id=#{userId} and t3.status=1 and t4.style_type=#{styleType}
<if test="moduleType != null and moduleType != ''">
and t4.module_type = #{moduleType}
</if>
ORDER BY t4.module_type,t4.label_sort_num,t4.label_name,t4.module_id
</select>

1
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -945,6 +945,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} else if (accountType == 6) {
param.put("projectSn", sn);
param.put("userId", userId);
param.put("moduleType", moduleType);
moduleList = baseModuleMapper.getProjectUserModuleList(param);
menuList = baseMenuService.getProjectUserMenuList(param);
actionList = baseActionMapper.getProjectUserActionList(param);