Merge branch '夜班绩效位置迁移' into v2020morge-job

performance/Performance.Api/Controllers/AccountController.cs

@@ -92,13 +92,13 @@ public ApiResponse<JwtToken> Refresh()
             var userClaim = _claim.GetUserClaim();
             var claims = new Claim[]
             {
-                new Claim(JwtClaimTypes.Id, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Id).Value),
-                new Claim(JwtClaimTypes.Login, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Login).Value),
-                new Claim(JwtClaimTypes.RealName,  userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.RealName).Value),
-                new Claim(JwtClaimTypes.Mail, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Mail).Value),
-                new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName).Value),
-                new Claim(JwtClaimTypes.Device, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device).Value),
-                new Claim(JwtClaimTypes.Department, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Department).Value),
+                new Claim(JwtClaimTypes.Id, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Id)?.Value??""),
+                new Claim(JwtClaimTypes.Login, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Login)?.Value??""),
+                new Claim(JwtClaimTypes.RealName,  userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.RealName)?.Value??""),
+                new Claim(JwtClaimTypes.Mail, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Mail)?.Value??""),
+                new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName)?.Value??""),
+                new Claim(JwtClaimTypes.Device, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device)?.Value??""),
+                new Claim(JwtClaimTypes.Department, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Department)?.Value??""),
             };
 
             var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.ExpirationMinutes);
@@ -271,9 +271,9 @@ public ApiResponse<JwtToken> DemoUsers(int userId)
                 new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
                 new Claim(JwtClaimTypes.Login, user.Login),
                 new Claim(JwtClaimTypes.RealName,  user.RealName),
-                new Claim(JwtClaimTypes.Mail, user.Mail),
-                new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName).Value),
-                new Claim(JwtClaimTypes.Device,userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device).Value),
+                new Claim(JwtClaimTypes.Mail, user.Mail??""),
+                new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName)?.Value??""),
+                new Claim(JwtClaimTypes.Device,userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device)?.Value??""),
                 new Claim(JwtClaimTypes.Department, user.Department ?? ""),
             };
 

performance/Performance.Services/RoleService.cs

@@ -60,7 +60,7 @@ 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)
+            if (user.ParentID!=null && user.ParentID!=0)
             {
                 ParentUser=_userRepository.GetEntities(c => c.ParentID == user.ParentID);
             }

performance/Performance.Services/UserService.cs

@@ -526,8 +526,8 @@ public UserResponse ResetPwd(int userId, int loginUserId)
             if (user == null)
                 throw new PerformanceException($"用户不存在 UserId：{userId}");
 
-            if (user.CreateUser != loginUserId)
-                throw new PerformanceException($"当前用户无权限重置用户密码");
+            //if (user.CreateUser != loginUserId)
+            //    throw new PerformanceException($"当前用户无权限重置用户密码");
 
             user.Password = "123456";
             if (!_userRepository.Update(user))