Merge remote-tracking branch 'origin/v2020morge' into v2020morge

performance/Performance.EntityModels/Entity/report_performance_category.cs

@@ -7,43 +7,48 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("report_performance_category")]
-	public class report_performance_category
+    public class report_performance_category
     {
-    
         /// <summary>
         /// 
         /// </summary>
-        public string Category { get; set; }
-    
+        [Key]
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
-        public string Original { get; set; }
-    
+        public int Year { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
-        public string ItemName { get; set; }
-    
+        public int Month { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
-        public int Year { get; set; }
-    
+        public string Category { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
-        public int Month { get; set; }
+        public string Original { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ItemName { get; set; }
     }
 }

performance/Performance.Services/RoleService.cs

@@ -62,10 +62,10 @@ public List<RoleResponse> GetUsersRole(int userid)
             var ParentUser = _userRepository.GetEntities(c => c.ParentID == userid);
             if (user.ParentID!=null || user.ParentID==0)
             {
-                ParentUser=_userRepository.GetEntities(c => c.ID == user.ParentID);
+                ParentUser=_userRepository.GetEntities(c => c.ParentID == user.ParentID);
             }
             
-            if (user != null)   
+            if (ParentUser != null)   
             {
                 foreach (var sysUser in ParentUser)
                 {