diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 106beb6..2806872 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -110,7 +110,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u."); queryWrapper.eq("u.delete_enum", "FALSE"); - queryWrapper.apply("u.id != u.corpinfo_id"); + if(!ObjectUtils.isEmpty(params.get("noMain"))){ + queryWrapper.apply("u.id != u.corpinfo_id"); + } + queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); String menuPerms = ""; if (!ObjectUtils.isEmpty(params.get("menuPath"))){ diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index dfecc5a..44f13e6 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -71,7 +71,9 @@ left join department d on d.id = u.department_id left join post p on p.id = u.post_id - u.id != u.corpinfo_id + + and u.id != u.corpinfo_id + and u.delete_enum = 'FALSE' and u.corpinfo_id = #{params.corpinfoId}