From 461caf210503ea56971f52fd4a244a3fc2bb7891 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 23 Mar 2022 17:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BA=BA=E5=91=98=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA-=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java    | 2 ++
 .../src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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<TsRoleDao, TsRole> implements
     public List<TsRole> getAll() {
         QueryWrapper<TsRole> tsRoleQueryWrapper=new QueryWrapper<>();
         tsRoleQueryWrapper.eq("ROLE_HIERARCHY",1);
+        tsRoleQueryWrapper.orderByDesc("NAME");
         List<TsRole> rootRole=tsRoleDao.selectList(tsRoleQueryWrapper);
         for(TsRole tsRole:rootRole){
             tsRole.setChildren(recursionGetRole(tsRole));
@@ -70,6 +71,7 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
         QueryWrapper<TsRole> tsRoleQueryWrapper=new QueryWrapper<>();
         tsRoleQueryWrapper.eq("parent_id",tsRole.getId());
         tsRoleQueryWrapper.eq("ROLE_HIERARCHY",tsRole.getRoleHierarchy()+1);
+        tsRoleQueryWrapper.orderByDesc("NAME");
         List<TsRole> 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 @@
     </select>
 
     <select id="selectUserByRoleByPage" resultMap="UserPosition">
-        SELECT ts_user.UNAME,ts_user.USID from ts_user
+        SELECT ts_user.UNAME,ts_user.USID,ts_user.INSTITUTION_ID  , ts_institution.name as institution_name from ts_user
+        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
         LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id
         WHERE ts_user_position.position_id in (
         SELECT ts_position_role.position_id from ts_position_role