更新wtm
This commit is contained in:
1 parent
f119665d29
commit
3467d4aa9d
60 files changed
+1932
-397
No files matched your search
@@ -212,7 +212,7 @@ namespace WalkingTec.Mvvm.Core
|
||||
{
|
||||
var fp = Wtm.ServiceProvider.GetRequiredService<WtmFileProvider>();
|
||||
// var tempdc = Wtm.DC;
|
||||
file = fp.GetFile(UploadFileId, true,Wtm.CreateDC(false,"default"));
|
||||
file = fp.GetFile(UploadFileId, true,Wtm.CreateDC(false));
|
||||
//Wtm.DC = tempdc;
|
||||
}
|
||||
if (file == null)
|
||||
@@ -908,7 +908,7 @@ namespace WalkingTec.Mvvm.Core
|
||||
|
||||
foreach (var item in DeletedFileIds)
|
||||
{
|
||||
fp.DeleteFile(item.ToString(), Wtm.CreateDC(false, "default"));
|
||||
fp.DeleteFile(item.ToString(), Wtm.CreateDC(false));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1275,7 +1275,14 @@ namespace WalkingTec.Mvvm.Core
|
||||
//将字段名保存,为后面生成错误信息作准备
|
||||
props.AddRange(field.GetProperties());
|
||||
}
|
||||
|
||||
if (typeof(ITenant).IsAssignableFrom(modelType) && props.Any(x => x.Name.ToLower() == "tenantcode") == false && Wtm?.ConfigInfo.EnableTenant == true && group.UseTenant == true)
|
||||
{
|
||||
ITenant ent = Entity as ITenant;
|
||||
ent.TenantCode = LoginUserInfo.CurrentTenant;
|
||||
var f = new DuplicatedField<P>(x => (x as ITenant).TenantCode);
|
||||
Expression exp = f.GetExpression(Entity, para);
|
||||
conditions.Add(exp);
|
||||
}
|
||||
if (conditions.Count > 0)
|
||||
{
|
||||
//循环添加条件并生成Where语句
|
||||
|
||||
Reference in new issue
Block a user