|
|
@ -72,10 +72,10 @@ public class CodeFormSetService : IFormSetService
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
#region 添加系统参数 是否租户共享信息
|
|
|
|
#region 添加系统参数 是否租户共享信息
|
|
|
|
var query = tenantDb.Queryable<CodeFormSet>();
|
|
|
|
var query = tenantDb.Queryable<CodeFormSet>();
|
|
|
|
var config = db.Queryable<SysConfig>().Where(x => x.Status == StatusEnum.Enable && x.Code == "IsTenantShareInfo").First();
|
|
|
|
//var config = db.Queryable<SysConfig>().Where(x => x.Status == StatusEnum.Enable && x.Code == "IsTenantShareInfo").First();
|
|
|
|
|
|
|
|
|
|
|
|
if (config.IsNotNull() && config.Value == "TRUE")
|
|
|
|
//if (config.IsNotNull() && config.Value == "TRUE")
|
|
|
|
query.ClearFilter<IOrgId>();
|
|
|
|
// query.ClearFilter<IOrgId>();
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
if (query
|
|
|
|
if (query
|
|
|
|
.Where(x => x.PermissionId == req.PermissionId && x.FormNo == req.FormNo && x.TaskStatus == req.TaskStatus && x.Id != req.Id).Any())
|
|
|
|
.Where(x => x.PermissionId == req.PermissionId && x.FormNo == req.FormNo && x.TaskStatus == req.TaskStatus && x.Id != req.Id).Any())
|
|
|
@ -246,10 +246,10 @@ public class CodeFormSetService : IFormSetService
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
|
|
|
|
#region 添加系统参数 是否租户共享信息
|
|
|
|
#region 添加系统参数 是否租户共享信息
|
|
|
|
var query = tenantDb.Queryable<CodeFormSet>();
|
|
|
|
var query = tenantDb.Queryable<CodeFormSet>();
|
|
|
|
var config = db.Queryable<SysConfig>().Where(x => x.Status == StatusEnum.Enable && x.Code == "IsTenantShareInfo").First();
|
|
|
|
//var config = db.Queryable<SysConfig>().Where(x => x.Status == StatusEnum.Enable && x.Code == "IsTenantShareInfo").First();
|
|
|
|
|
|
|
|
|
|
|
|
if (config.IsNotNull() && config.Value == "TRUE")
|
|
|
|
//if (config.IsNotNull() && config.Value == "TRUE")
|
|
|
|
query.ClearFilter<IOrgId>();
|
|
|
|
// query.ClearFilter<IOrgId>();
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
var info = await query.Where(x => x.Id == long.Parse(id)).FirstAsync();
|
|
|
|
var info = await query.Where(x => x.Id == long.Parse(id)).FirstAsync();
|
|
|
|
|
|
|
|
|
|
|
|