Skip to content

Commit c711a3d

Browse files
committed
#更新sdk#
1 parent 486a035 commit c711a3d

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="AspectCore.Extensions.Reflection" Version="0.7.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
20-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" />
18+
<PackageReference Include="AspectCore.Extensions.Reflection" Version="1.0.1" />
19+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
20+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
2121
<PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.1.1" />
2222
<PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
23-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.2" />
24-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
25-
<PackageReference Include="MySql.Data" Version="8.0.11" />
26-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.12.0-beta3" />
27-
<PackageReference Include="SqlKata" Version="1.0.4" />
28-
<PackageReference Include="SqlKata.Execution" Version="1.0.4" />
29-
<PackageReference Include="sqlSugarCore" Version="4.6.4.9" />
23+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
24+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5" />
25+
<PackageReference Include="MySql.Data" Version="8.0.12" />
26+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />
27+
<PackageReference Include="SqlKata" Version="1.1.3" />
28+
<PackageReference Include="SqlKata.Execution" Version="1.1.3" />
29+
<PackageReference Include="sqlSugarCore" Version="4.8.1" />
3030
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
3131
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="3.0.0" />
3232
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="3.0.0" />

APIJSON.NET/APIJSON.NET/SelectTable.cs

+6
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ private ISugarQueryable<ExpandoObject> sugarQueryable(string subtable, string se
126126
throw new Exception($"表名{subtable}不正确!");
127127
}
128128
var tb = db.Db.Queryable(subtable, "tb");
129+
130+
129131
if (values["@column"].IsValue())
130132
{
131133
var str = new System.Text.StringBuilder(100);
@@ -160,6 +162,10 @@ private ISugarQueryable<ExpandoObject> sugarQueryable(string subtable, string se
160162
}
161163

162164
List<IConditionalModel> conModels = new List<IConditionalModel>();
165+
if (values["identity"].IsValue())
166+
{
167+
conModels.Add(new ConditionalModel() { FieldName = values["identity"].ToString(), ConditionalType = ConditionalType.Equal, FieldValue = _identitySvc.GetUserIdentity() });
168+
}
163169
foreach (var va in values)
164170
{
165171
string vakey = va.Key.Trim();

0 commit comments

Comments
 (0)