XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改字典

Uat_Study
hang 2022-05-31 16:40:29 +08:00
parent 318bdbfef0
commit 3de2321461
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.API/Controllers/ExtraController.cs
View File

@ -23,6 +23,7 @@ using IRaCIS.Core.Infra.EFCore;
using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using System.Linq; using System.Linq;
using Microsoft.Extensions.Logging;
namespace IRaCIS.Api.Controllers namespace IRaCIS.Api.Controllers
{ {
@ -195,7 +196,7 @@ namespace IRaCIS.Api.Controllers
[HttpGet("User/UserRedirect")] [HttpGet("User/UserRedirect")]
[AllowAnonymous] [AllowAnonymous]
public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url) public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url ,[FromServices]ILogger<ExtraController> _logger)
{ {
var decodeUrl = System.Web.HttpUtility.UrlDecode(url); var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
@ -208,9 +209,13 @@ namespace IRaCIS.Api.Controllers
var errorUrl = domainStrList[0]+"//"+ domainStrList[2]+ "/error"; var errorUrl = domainStrList[0]+"//"+ domainStrList[2]+ "/error";
_logger.LogError(errorUrl);
if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd)) if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
{ {
decodeUrl = errorUrl+ "?ErrorMessage=您的初始化链接已过期"; decodeUrl = errorUrl+ "?ErrorMessage=您的初始化链接已过期";
_logger.LogError(errorUrl);
} }
return Redirect(decodeUrl); return Redirect(decodeUrl);

2
IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
View File

@ -74,7 +74,7 @@ namespace IRaCIS.Application.Contracts
public DicDataTypeEnum DataTypeEnum { get; set; } public DicDataTypeEnum DataTypeEnum { get; set; }
public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^\d*$"); public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^\d*$") && DataTypeEnum== DicDataTypeEnum.Enum;
} }

2
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -182,7 +182,7 @@ namespace IRaCIS.Application.Services
[AllowAnonymous] [AllowAnonymous]
public async Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataAllSelect() public async Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataAllSelect()
{ {
var searchList = await _dicRepository.Where(t => t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync(); var searchList = await _dicRepository.Where(t => t.ParentId != null && t.IsEnable ).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync();
return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList()); return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
} }