From 2d04b2f19d201ff10ed76c1773235488e9ab7628 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期三, 20 九月 2023 09:50:48 +0800
Subject: [PATCH] 修改权限开通逻辑
---
DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +-
DocumentServiceApi.InitQMessage/MessageReceive.cs | 14 ++++++++++++--
DocumentServiceAPI.Model/Oder/Oder.cs | 5 ++++-
DocumentServiceApi.InitQMessage/TenantOderInfo.cs | 6 ++++++
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/DocumentServiceAPI.Model/Oder/Oder.cs b/DocumentServiceAPI.Model/Oder/Oder.cs
index 7219edf..6cc5dbb 100644
--- a/DocumentServiceAPI.Model/Oder/Oder.cs
+++ b/DocumentServiceAPI.Model/Oder/Oder.cs
@@ -72,6 +72,9 @@
/// </summary>
[Display(Name = "鏄惁鏈夌鐞嗘潈闄� ")]
public bool HasManagePermission { get; set; } = false;
-
+ /// <summary>
+ ///绉熸埛ID
+ /// </summary>
+ public int? TenantId { get; set; }
}
}
diff --git a/DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user b/DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
index 23097f9..b7a65d9 100644
--- a/DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\DocServiceAPI</_PublishTargetUrl>
- <History>True|2023-08-31T05:24:57.6027041Z;False|2023-08-31T13:21:45.8166199+08:00;False|2023-08-31T13:21:11.3863426+08:00;True|2023-08-25T16:28:37.8668025+08:00;True|2023-08-25T15:17:17.9212851+08:00;True|2023-08-25T11:21:18.2228201+08:00;True|2023-08-03T11:23:49.7155745+08:00;True|2023-08-03T10:57:12.3860490+08:00;True|2023-08-02T17:29:04.8984231+08:00;True|2023-08-02T14:24:54.6607875+08:00;True|2023-08-02T13:12:00.3228236+08:00;</History>
+ <History>True|2023-09-19T01:20:31.2474367Z;True|2023-08-31T13:24:57.6027041+08:00;False|2023-08-31T13:21:45.8166199+08:00;False|2023-08-31T13:21:11.3863426+08:00;True|2023-08-25T16:28:37.8668025+08:00;True|2023-08-25T15:17:17.9212851+08:00;True|2023-08-25T11:21:18.2228201+08:00;True|2023-08-03T11:23:49.7155745+08:00;True|2023-08-03T10:57:12.3860490+08:00;True|2023-08-02T17:29:04.8984231+08:00;True|2023-08-02T14:24:54.6607875+08:00;True|2023-08-02T13:12:00.3228236+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/DocumentServiceApi.InitQMessage/MessageReceive.cs b/DocumentServiceApi.InitQMessage/MessageReceive.cs
index ddb76ff..eb8f76a 100644
--- a/DocumentServiceApi.InitQMessage/MessageReceive.cs
+++ b/DocumentServiceApi.InitQMessage/MessageReceive.cs
@@ -60,10 +60,20 @@
PayTime = obj.PayTime,
ZcUserID = obj.ZcUserID,
ITCode = obj.ITCode,
- HasDocumentPermission=obj.HasDocumentPermission
+ HasDocumentPermission=obj.HasDocumentPermission,
+ HasManagePermission= obj.HasManagePermission,
+ TenantId= obj.TenantId,
+
+
};
- TenantInfo? Tinfo = await _db.Queryable<TenantInfo>().Where(x=>x.ZcUserID==obj.ZcUserID).SingleAsync();
+ TenantInfo? Tinfo = null;
+ if (obj.TenantId!=null)
+ Tinfo = await _db.Queryable<TenantInfo>().Where(x => x.Id == obj.TenantId).SingleAsync();
+ // 濡傛灉娌℃湁tengdeid 瑙嗕负鏂板缓tenggdeid
+ // else
+
+ //Tinfo= await _db.Queryable<TenantInfo>().Where(x=>x.ZcUserID==obj.ZcUserID).SingleAsync();
if(Tinfo==null)
{
Tinfo = new TenantInfo
diff --git a/DocumentServiceApi.InitQMessage/TenantOderInfo.cs b/DocumentServiceApi.InitQMessage/TenantOderInfo.cs
index 2adef05..cbd2379 100644
--- a/DocumentServiceApi.InitQMessage/TenantOderInfo.cs
+++ b/DocumentServiceApi.InitQMessage/TenantOderInfo.cs
@@ -68,5 +68,11 @@
public bool HasManagePermission { get; set; } = false;
+ /// <summary>
+ /// 涓烘潈闄愬涔扮殑绉熸埛ID
+ /// </summary>
+
+ public int ? TenantId { get; set; }
+
}
}
--
Gitblit v1.9.1