Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev

2023-05-31 10:19:09 +08:00
parent 9c621c75cd ea3a325ecb
commit 916875de9f
82 changed files with 3193 additions and 535 deletions
--- a/common/Tnb.Common.Core/Manager/User/UserManager.cs
+++ b/common/Tnb.Common.Core/Manager/User/UserManager.cs
@@ -194,7 +194,18 @@ public class UserManager : IUserManager, IScoped
    /// </summary>
    public string UserOrigin
    {
-        get => _httpContext?.Request.Headers["jnpf-origin"];
+        //modifyby zhoukeda 调用发起工作流接口取不到pc还是app 改成默认pc
+        get
+        {
+            try
+            {
+                return _httpContext?.Request.Headers["jnpf-origin"] ?? "pc";
+            }
+            catch (Exception e)
+            {
+                return "pc";
+            }
+        }
    }

    /// <summary>