|
@@ -1638,7 +1638,9 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
|
|
|
var _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
|
|
var _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
|
|
|
|
|
|
- var translatorData = _sqlSugar.Queryable<Res_TranslatorLibrary>().Where(a => a.IsDel == 0).Select(x => new { x.Id, x.Name }).ToList();
|
|
|
|
|
|
+ var translatorData = _sqlSugar.Queryable<Res_TranslatorLibrary>().Where(a => a.IsDel == 0).Select(x => new TranslatorLibraryNameView() { Id = x.Id, Name = x.Name }).ToList();
|
|
|
|
+ foreach (var item in translatorData) EncryptionProcessor.DecryptProperties(item);
|
|
|
|
+
|
|
return Ok(JsonView(true, "查询成功!", new { Delegation = groupInfos, SetData = data, DeleFile = _DeleFile , TranslatorData = translatorData }));
|
|
return Ok(JsonView(true, "查询成功!", new { Delegation = groupInfos, SetData = data, DeleFile = _DeleFile , TranslatorData = translatorData }));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3669,6 +3671,7 @@ WHERE
|
|
|
|
|
|
#region 翻译人员
|
|
#region 翻译人员
|
|
|
|
|
|
|
|
+
|
|
/// <summary>
|
|
/// <summary>
|
|
/// 翻译人员库
|
|
/// 翻译人员库
|
|
/// Init
|
|
/// Init
|
|
@@ -3727,6 +3730,8 @@ WHERE
|
|
|
|
|
|
var info = await _translatorRep.Query(x => x.Id == id).FirstAsync();
|
|
var info = await _translatorRep.Query(x => x.Id == id).FirstAsync();
|
|
|
|
|
|
|
|
+ EncryptionProcessor.DecryptProperties(info);
|
|
|
|
+
|
|
var view = _mapper.Map<TranslatorLibraryInfoView>(info);
|
|
var view = _mapper.Map<TranslatorLibraryInfoView>(info);
|
|
|
|
|
|
//var data1 = await _sqlSugar.Queryable<Grp_OfficialDutyLinkTranslator>().Where(x => x.TranslatorId == id).Select(x => x.Id).ToArrayAsync();
|
|
//var data1 = await _sqlSugar.Queryable<Grp_OfficialDutyLinkTranslator>().Where(x => x.TranslatorId == id).Select(x => x.Id).ToArrayAsync();
|
|
@@ -3752,30 +3757,33 @@ WHERE
|
|
{
|
|
{
|
|
if (dto.PortType < 1 || dto.PortType > 3) return Ok(JsonView(false, MsgTips.Port));
|
|
if (dto.PortType < 1 || dto.PortType > 3) return Ok(JsonView(false, MsgTips.Port));
|
|
|
|
|
|
|
|
+ var name = AesEncryptionHelper.Encrypt(dto.Name);
|
|
|
|
+
|
|
RefAsync<int> total = 0;
|
|
RefAsync<int> total = 0;
|
|
var view = await _sqlSugar.Queryable<Res_TranslatorLibrary>()
|
|
var view = await _sqlSugar.Queryable<Res_TranslatorLibrary>()
|
|
.Where(x => x.IsDel == 0)
|
|
.Where(x => x.IsDel == 0)
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.Name), x => x.Name.Contains(dto.Name))
|
|
|
|
- .Select(x => new
|
|
|
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(name), x => x.Name.Contains(name))
|
|
|
|
+ .Select(x => new TranslatorLibraryItemView()
|
|
{
|
|
{
|
|
- x.Id,
|
|
|
|
- x.Area,
|
|
|
|
- x.Name,
|
|
|
|
|
|
+ Id = x.Id,
|
|
|
|
+ Area = x.Area,
|
|
|
|
+ Name = x.Name,
|
|
Sex = x.Sex == 0 ? "未设置" : x.Sex == 1 ? "男" : "女",
|
|
Sex = x.Sex == 0 ? "未设置" : x.Sex == 1 ? "男" : "女",
|
|
- x.Tel,
|
|
|
|
- x.Email,
|
|
|
|
- x.WechatNo,
|
|
|
|
- x.Language,
|
|
|
|
- x.Price,
|
|
|
|
- //x.Currency,
|
|
|
|
|
|
+ Tel = x.Tel,
|
|
|
|
+ Email = x.Email,
|
|
|
|
+ WechatNo = x.WechatNo,
|
|
|
|
+ Language = x.Language,
|
|
|
|
+ Price = x.Price,
|
|
Currency = SqlFunc.Subqueryable<Sys_SetData>().Where(x1 => x1.Id == x.Currency).Select(x1 => x1.Name) ?? "-",
|
|
Currency = SqlFunc.Subqueryable<Sys_SetData>().Where(x1 => x1.Id == x.Currency).Select(x1 => x1.Name) ?? "-",
|
|
CreateUserName = SqlFunc.Subqueryable<Sys_Users>().Where(x1 => x1.Id == x.CreateUserId).Select(x1 => x1.CnName) ?? "-",
|
|
CreateUserName = SqlFunc.Subqueryable<Sys_Users>().Where(x1 => x1.Id == x.CreateUserId).Select(x1 => x1.CnName) ?? "-",
|
|
- x.CreateTime,
|
|
|
|
- x.Remark
|
|
|
|
|
|
+ CreateTime = x.CreateTime,
|
|
|
|
+ Remark = x.Remark
|
|
})
|
|
})
|
|
.OrderByDescending(x => x.CreateTime)
|
|
.OrderByDescending(x => x.CreateTime)
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
|
|
|
|
|
+ foreach (var item in view) EncryptionProcessor.DecryptProperties(item);
|
|
|
|
+
|
|
return Ok(JsonView(view, total));
|
|
return Ok(JsonView(view, total));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3836,6 +3844,7 @@ WHERE
|
|
|
|
|
|
#region 参数处理
|
|
#region 参数处理
|
|
|
|
|
|
|
|
+ EncryptionProcessor.EncryptProperties(dto);
|
|
var translatorInfo = _mapper.Map<Res_TranslatorLibrary>(dto);
|
|
var translatorInfo = _mapper.Map<Res_TranslatorLibrary>(dto);
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
@@ -3851,7 +3860,7 @@ WHERE
|
|
translatorInfo.CreateUserId = currUserInfo.UserId;
|
|
translatorInfo.CreateUserId = currUserInfo.UserId;
|
|
if (fileNames.Count > 0)
|
|
if (fileNames.Count > 0)
|
|
{
|
|
{
|
|
- translatorInfo.Files = JsonConvert.SerializeObject(fileNames);
|
|
|
|
|
|
+ translatorInfo.Files = AesEncryptionHelper.Encrypt(JsonConvert.SerializeObject(fileNames));
|
|
}
|
|
}
|
|
|
|
|
|
var id = await _translatorRep.AddAsync(translatorInfo);
|
|
var id = await _translatorRep.AddAsync(translatorInfo);
|
|
@@ -3902,7 +3911,7 @@ WHERE
|
|
}
|
|
}
|
|
if (fileNames.Count > 0)
|
|
if (fileNames.Count > 0)
|
|
{
|
|
{
|
|
- translatorInfo.Files = JsonConvert.SerializeObject(fileNames);
|
|
|
|
|
|
+ translatorInfo.Files = AesEncryptionHelper.Encrypt(JsonConvert.SerializeObject(fileNames));
|
|
}
|
|
}
|
|
|
|
|
|
var upd = await _translatorRep
|
|
var upd = await _translatorRep
|