项目厂房数据权限修复

赖素文
1 parent 91bd94e8
Showing 1 changed file with 11 additions and 15 deletions
sys/Hh.Mes.Service/WebService/Configure/factoryService.cs
@@ -4,7 +4,6 @@ using Hh.Mes.Pojo.System;
 using Hh.Mes.POJO.Entity;
 using Hh.Mes.POJO.Response;
 using Hh.Mes.Service.Repository;
-using NPOI.POIFS.FileSystem;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -89,18 +88,6 @@ namespace Hh.Mes.Service.Configure
  
         public Task<DataSet> Load(PageReq pageReq, base_factory mode)
         {
-            //用户-客户 客户关联的项目
-            string user = sysWebUser.Account;
-            if (user != SystemVariable.DefaultCreated)//非管理员
-            {
-                var clientKeys = Context.Queryable<sys_user_project_rel>().Where(x => x.userAccount == user).First();
-                if (clientKeys != null)
-                {
-                    //List<Guid> projectKeysList = Context.Queryable<base_project_client_rel>().Where(x => x.clientKeys == clientKeys.clientKeys).Select(x => x.projectKeys).ToList();
-                    mode.projectKeysString = "";//string.Join(",", projectKeysList);
-                }
-            }
-
             string orderBy = (pageReq == null || string.IsNullOrEmpty(pageReq.field)) ? " id desc" : $"{pageReq.field} {pageReq.order} ";
             string sqlWhere = LoadSqlWhere(mode);
             var stringBuilder = new StringBuilder();
@@ -112,7 +99,8 @@ namespace Hh.Mes.Service.Configure
                 stringBuilder.AppendLine($"  select @pageIndex={pageReq.page}, @pageSize={pageReq.limit}, @offset=(@pageIndex - 1) * @pageSize");
             }
  
-            stringBuilder.AppendLine($@" select t1.* from base_factory t1 
+            stringBuilder.AppendLine($@" select t1.*,t2.userAccount from base_factory t1 
+                                         left join sys_user_project_rel t2 on t1.projectKeys=t2.clientKeys 
                                          where {sqlWhere}
                                          order by {orderBy} ");
  
@@ -120,7 +108,9 @@ namespace Hh.Mes.Service.Configure
             if (!mode.Exel)
             {
                 stringBuilder.AppendLine("  offset @offset row fetch next @pageSize row only ");
-                stringBuilder.Append($" select rowTotal= count(*) from base_factory  t1  with(nolock) where {sqlWhere}");
+                stringBuilder.Append($@" select rowTotal= count(*) from base_factory  t1  with(nolock)  
+                                         left join sys_user_project_rel t2 on t1.projectKeys=t2.clientKeys  
+                                         where {sqlWhere}");
             }
             return base.Context.Ado.GetDataSetAllAsync(stringBuilder.ToString(), new List<SugarParameter>(){
                 new SugarParameter("@factoryCode", $"%{mode.factoryCode}%"),
@@ -152,6 +142,12 @@ namespace Hh.Mes.Service.Configure
             {
                 stringBuilder.Append(" and  t1.projectKeys =  @factorySelectWhere");
             }
+            //非管理员，查询登陆用户绑定 信息
+            string user = sysWebUser.Account;
+            if (user != SystemVariable.DefaultCreated)
+            {
+                stringBuilder.Append($" and  t2.userAccount ='{user}'");
+            }
             return stringBuilder.ToString();
         }