commit by yzf

FactorySystemBll/BaseBll.cs

@@ -321,10 +321,11 @@ namespace FactorySystemBll
                     }
                     if (funcType > 0)
                     {
-                        List<TUser> users = db.Queryable<TUser, TRole_Right>((a, b) => new JoinQueryInfos(JoinType.Left, a.FRoleID == b.FRoleID))
+                        List<TUser> users = db.Queryable<TUser, TRole_Right, FPower>((a, b, c) => new JoinQueryInfos(JoinType.Left, a.FRoleID == b.FRoleID, 
-                                .Where((a, b) => a.FState == 1 && a.FDeleted != 1 && b.FType == funcType && funcVal.Contains(b.FFunctionID.ToString()))
+                            JoinType.Left, a.FID == int.Parse(c.FUserID)))
-                                .Where(string.IsNullOrEmpty(factoryId) ? "1=1" : string.Format("a.FFactoryID in({0})", factoryId))
+                                 .Where((a, b) => a.FState == 1 && a.FDeleted != 1 && b.FType == funcType && funcVal.Contains(b.FFunctionID.ToString()))
-                                .GroupBy("a.FID,a.FFactoryID,a.FName,a.FUser").Select<TUser>("a.FID,a.FFactoryID,a.FName,a.FUser").ToList();
+                                 .Where(string.IsNullOrEmpty(factoryId) ? "1=1" : string.Format("c.FFactoryID in({0})", factoryId))
+                                 .GroupBy("a.FID,c.FFactoryID,a.FName,a.FUser").Select<TUser>("a.FID,c.FFactoryID,a.FName,a.FUser").ToList();
                         if (users.Count() > 0)
                         {
                             if (string.IsNullOrEmpty(factoryId))
@@ -517,10 +518,11 @@ namespace FactorySystemBll
                     }
                     if (funcType > 0)
                     {
-                        List<TUser> users = db.Queryable<TUser, TRole_Right>((a, b) => new JoinQueryInfos(JoinType.Left, a.FRoleID == b.FRoleID))
+                        List<TUser> users = db.Queryable<TUser, TRole_Right, FPower>((a, b, c) => new JoinQueryInfos(JoinType.Left, a.FRoleID == b.FRoleID,
-                                .Where((a, b) => a.FState == 1 && a.FDeleted != 1 && b.FType == funcType && funcVal.Contains(b.FFunctionID.ToString()))
+                             JoinType.Left, a.FID == int.Parse(c.FUserID)))
-                                .Where(string.IsNullOrEmpty(factoryId) ? "1=1" : string.Format("a.FFactoryID in({0})", factoryId))
+                                  .Where((a, b) => a.FState == 1 && a.FDeleted != 1 && b.FType == funcType && funcVal.Contains(b.FFunctionID.ToString()))
-                                .GroupBy("a.FID,a.FFactoryID,a.FName,a.FUser").Select<TUser>("a.FID,a.FFactoryID,a.FName,a.FUser").ToList();
+                                  .Where(string.IsNullOrEmpty(factoryId) ? "1=1" : string.Format("c.FFactoryID in({0})", factoryId))
+                                  .GroupBy("a.FID,c.FFactoryID,a.FName,a.FUser").Select<TUser>("a.FID,c.FFactoryID,a.FName,a.FUser").ToList();
                         if (users.Count() > 0)
                         {
                             if (string.IsNullOrEmpty(factoryId))

FactorySystemBll/UserBll.cs

@@ -158,8 +158,11 @@ namespace FactorySystemBll
             List<string> roles = new List<string>();
             if (null == roleIds || string.IsNullOrEmpty(roleIds.ToString()))
             {
-                TUser userInfo = db.Queryable<TUser>().Where(s => s.FID == userId && s.FDeleted != (int)Constant.DeleteCode.已删除).First();
+                //TUser userInfo = db.Queryable<TUser>().Where(s => s.FID == userId && s.FDeleted != (int)Constant.DeleteCode.已删除).First();
-                roleIds = userInfo.FRoleID;
+                //roleIds = userInfo.FRoleID;
+
+                List<FPower> fPower = db.Queryable<FPower>().Where(s => s.FUserID == userId.ToString()).ToList();
+                roleIds= string.Join(",", fPower.Select(m => m.FRole).Distinct().ToList());
             }
             roles = roleIds.ToString().Trim(',').Split(',').ToList();