修改提交

2024-12-24 16:36:54 +08:00
parent dc32df27ec
commit a1199b44a3
3 changed files with 7 additions and 7 deletions
@@ -829,7 +829,7 @@ namespace IRaCIS.Core.Application.Service
            var userLoginReturnModel = new LoginReturnDTO();


-            var loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();

            if (loginUser == null)
            {
@@ -991,11 +991,6 @@ namespace IRaCIS.Core.Application.Service

            var loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();

-            if (loginUser == null)
-            {
-                loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-            }
-
            if (loginUser == null)
            {

@@ -147,7 +147,10 @@ namespace IRaCIS.Core.Application.Service
                .ForMember(d => d.UserTypeShortName, c => c.MapFrom(t => t.UserTypeRole.UserTypeShortName));


-            CreateMap<IdentityUser, User>();
+
+            CreateMap<User, IdentityUser>();
+
+            CreateMap<IdentityUser, UserBasicInfo>();

        }
    }