diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index e4ee3dac..b93029f4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -54,6 +54,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements public List getAll() { QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); tsRoleQueryWrapper.eq("ROLE_HIERARCHY",1); + tsRoleQueryWrapper.orderByDesc("NAME"); List rootRole=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRole:rootRole){ tsRole.setChildren(recursionGetRole(tsRole)); @@ -70,6 +71,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>(); tsRoleQueryWrapper.eq("parent_id",tsRole.getId()); tsRoleQueryWrapper.eq("ROLE_HIERARCHY",tsRole.getRoleHierarchy()+1); + tsRoleQueryWrapper.orderByDesc("NAME"); List tsRoles=tsRoleDao.selectList(tsRoleQueryWrapper); for(TsRole tsRoleNode:tsRoles){ tsRoleNode.setChildren(recursionGetRole(tsRoleNode)); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 07ca1c62..6d27f23b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -143,7 +143,8 @@