|
@@ -36,7 +36,7 @@ namespace OASystem.API.OAMethodLib
|
|
|
#region 员工注册默认添加基础页面
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
public static bool DefaultPostAuth(int depId,int postId, int userId,int createUserId)
|
|
|
{
|
|
@@ -49,18 +49,37 @@ namespace OASystem.API.OAMethodLib
|
|
|
|
|
|
if (_defaultData.Count < 1) return false;
|
|
|
|
|
|
+ var postJobDatas = _dirRep._sqlSugar.Queryable<Sys_JobPost>().Where(it => it.IsDel == 0).ToList();
|
|
|
+
|
|
|
List<int> pageData = new List<int>();
|
|
|
|
|
|
pageData.AddRange(_defaultData.Find(it => it.DepId == -1)?.PostPageAuths[0].PageIds ?? new List<int>());
|
|
|
|
|
|
var depPublicPageData = _defaultData.Find(it => it.DepId == depId);
|
|
|
+ var jobPublicPageData = postJobDatas.Find(it => it.DepId == depId && it.Id == postId);
|
|
|
if (depPublicPageData != null)
|
|
|
{
|
|
|
|
|
|
pageData.AddRange(depPublicPageData.PostPageAuths.Find(it => it.PostId == -1)?.PageIds ?? new List<int>());
|
|
|
-
|
|
|
- pageData.AddRange(depPublicPageData.PostPageAuths.Find(it => it.PostId == postId)?.PageIds ?? new List<int>());
|
|
|
|
|
|
+
|
|
|
+ if (depId == 7)
|
|
|
+ {
|
|
|
+ List<string> postNames = new List<string>() { "主管","经理" };
|
|
|
+
|
|
|
+ if (jobPublicPageData != null)
|
|
|
+ {
|
|
|
+
|
|
|
+ if (postNames.Contains(jobPublicPageData.JobName))
|
|
|
+ {
|
|
|
+ pageData.AddRange(depPublicPageData.PostPageAuths.Find(it => it.PostId == 0)?.PageIds ?? new List<int>());
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ pageData.AddRange(depPublicPageData.PostPageAuths.Find(it => it.PostId == postId)?.PageIds ?? new List<int>());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -82,8 +101,13 @@ namespace OASystem.API.OAMethodLib
|
|
|
IsTemp = 1
|
|
|
}).ToList();
|
|
|
|
|
|
+
|
|
|
if (defaultPageData.Count > 0)
|
|
|
{
|
|
|
+
|
|
|
+
|
|
|
+ defaultPageData = defaultPageData.Where(it => it.FId != 12).ToList();
|
|
|
+
|
|
|
|
|
|
var s = _dirRep._sqlSugar.Fastest<Sys_UserAuthority>().PageSize(100000).BulkCopy(defaultPageData);
|
|
|
if (s > 0)
|