个人信息角色顺序

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -119,7 +119,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.AccountController.DeleteUser(Performance.DtoModels.UserRequest)">
             <summary>
-            新增用户
+            删除用户
             </summary>
             <param name="request"></param>
             <returns></returns>

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -9553,11 +9553,6 @@
             核算单元
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.view_second_workload_result.HISDeptName">
-            <summary>
-            统计的HIS的原始科室名称
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.view_allot_result.Source">
             <summary>
             来源

performance/Performance.Services/RoleService.cs

@@ -34,7 +34,7 @@ public class RoleService : IAutoInjection
         /// <param name="userid"></param>
         /// <returns></returns>
         public List<RoleResponse> GetUserRole(int userid)
-        { 
+        {
             var roles = GetRole(userid);
             return _mapper.Map<List<RoleResponse>>(roles);
         }
@@ -62,17 +62,26 @@ public List<sys_role> GetRole(int userid)
         public List<RoleResponse> GetUsersRole(int userid)
         {
             List<RoleResponse> roleResponses = new List<RoleResponse>();
-            var user=_userRepository.GetEntity(c => c.ID == userid);
-            var ParentUser = _userRepository.GetEntities(c => c.ParentID == userid);
-            if (user.ParentID!=null && user.ParentID!=0)
+            var user = _userRepository.GetEntity(c => c.ID == userid);
+            var isParent = user.ParentID == null || user.ParentID == 0;
+            var roles = GetARole(isParent ? userid : (int)user.ParentID);
+            if (roles != null)
+            {
+                var role = _mapper.Map<RoleResponse>(roles);
+                role.Value = isParent ? userid : (int)user.ParentID;
+                roleResponses.Add(role);
+            }
+
+            var parentUser = _userRepository.GetEntities(c => c.ParentID == userid);
+            if (user.ParentID != null && user.ParentID != 0)
             {
-                ParentUser=_userRepository.GetEntities(c => c.ParentID == user.ParentID);
+                parentUser = _userRepository.GetEntities(c => c.ParentID == user.ParentID);
             }
-            
-            if (ParentUser != null)   
+
+            if (parentUser != null)
             {
                 var userRole = _userroleRepository.GetEntities();
-                foreach (var sysUser in ParentUser)
+                foreach (var sysUser in parentUser)
                 {
                     var useRoles = GetARole(sysUser.ID);
                     var role = _mapper.Map<RoleResponse>(useRoles);
@@ -82,16 +91,7 @@ public List<RoleResponse> GetUsersRole(int userid)
                 }
             }
 
-            var isParent = user.ParentID == null || user.ParentID == 0;
-            var roles = GetARole(isParent ? userid : (int)user.ParentID);
-            if (roles != null)
-
-            {
-                var role = _mapper.Map<RoleResponse>(roles);
-                role.Value = isParent ? userid : (int)user.ParentID;
-                roleResponses.Add(role);
-            }
-            return roleResponses?.OrderBy(t => t.Type).ToList();
+            return roleResponses.ToList();
         }
 
         /// <summary>