Skip to content

Commit

Permalink
fix: fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Qinyouzeng committed Jun 19, 2024
1 parent c1ee28e commit e812226
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -803,13 +803,13 @@ public Task<IEnumerable<ChartPointDto>> GetTraceErrorsAsync(ApmEndpointRequestDt
public Task<PhoneModelDto> GetDeviceModelAsync(string brand, string model)
{
var isCodeAlis = brand.ToLower().Equals("apple") && model.Contains(',');
var sql = $"select * from {Constants.ModelsTable} where Brand=@brand and {(isCodeAlis ? "CodeAlis=@model" : "Model=@model")} limit 1";
var sql = $"select * from {Constants.ModelsTable} where lower(Brand)=@brand and {(isCodeAlis ? "lower(CodeAlis)=@model" : "Model=@model")} limit 1";
PhoneModelDto result = default!;
lock (lockObj)
{
using var reader = Query(sql, new ClickHouseParameter[] {
new ClickHouseParameter{ ParameterName="brand",Value=brand.ToLower() },
new ClickHouseParameter{ ParameterName="model",Value=model.ToUpper() }
new ClickHouseParameter{ ParameterName="model",Value=model.ToLower() }
});
while (reader.NextResult())
while (reader.Read())
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Masa.Tsc.Web.Admin.Rcl/Pages/App/Index.razor
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class="my-2 pl-4">手机型号:@PhoneModel()</div>
<div class="my-2 pl-4">操作系统:@ClientOs()</div>
<div class="my-2 pl-4 d-flex justify-start">
<div>角色名称:</div><TooltipCopy TextFunc="(obj)=>RolesNames()" TextStyle="max-width:500px"> </TooltipCopy>
<div>角色名称:</div><TooltipCopy TextFunc="(obj)=>RolesNames()" ValueFunc="(obj)=>RolesNames()" TextStyle="max-width:500px"> </TooltipCopy>
</div>
<div class="pl-4"><MButton OnClick="@(()=>claimShow=true)">查看用户申明数据</MButton></div>
</div>
Expand Down

0 comments on commit e812226

Please sign in to comment.