diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml index e52cf6fd0..4769fae9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml @@ -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} + + and t4.module_type = #{moduleType} + ORDER BY t4.module_type,t4.label_sort_num,t4.label_name,t4.module_id diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 5eba321a0..b7ecf8f98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -945,6 +945,7 @@ public class SystemUserServiceImpl extends ServiceImpl