S8MasterDataAdapter.cs 4.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697
  1. using Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
  2. using Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
  3. using Admin.NET.Plugin.AiDOP.Infrastructure;
  4. namespace Admin.NET.Plugin.AiDOP.Service.S8;
  5. /// <summary>
  6. /// S8 主数据下拉:优先复用 S0 已落库主数据语义(部门等),无则返回空列表,不把「下拉查询」误建成独立业务表。
  7. ///
  8. /// <para><b>S8-P0-3-MASTERDATA-TRUSTED-SCOPE-1 作用域合同</b>:三个入口的工厂边界
  9. /// **一律由 <see cref="S8TrustedScopeResolver"/> 从认证身份解析**,
  10. /// 客户端传入的 <c>factoryRefId</c> 只被视为筛选意图,**当前实现直接忽略、不承担授权作用**。</para>
  11. ///
  12. /// <para>修复前(实测可被普通租户账号利用):<c>GetEmployeesAsync</c> 是
  13. /// <c>ClearFilter()</c> + <c>FactoryRefId == 客户端传入值</c>,
  14. /// 于是 <c>GET /master-data/employees?factoryRefId=1000</c> 会返回 500 条**其它租户**员工的
  15. /// 工号与真实姓名。</para>
  16. /// </summary>
  17. public class S8MasterDataAdapter : ITransient
  18. {
  19. private readonly SqlSugarRepository<AdoS0DepartmentMaster> _deptRep;
  20. private readonly SqlSugarRepository<AdoS0EmployeeMaster> _empRep;
  21. private readonly SqlSugarRepository<AdoS0LineMaster> _lineRep;
  22. private readonly SqlSugarRepository<SysUser> _sysUserRep;
  23. public S8MasterDataAdapter(
  24. SqlSugarRepository<AdoS0DepartmentMaster> deptRep,
  25. SqlSugarRepository<AdoS0EmployeeMaster> empRep,
  26. SqlSugarRepository<AdoS0LineMaster> lineRep,
  27. SqlSugarRepository<SysUser> sysUserRep)
  28. {
  29. _deptRep = deptRep;
  30. _empRep = empRep;
  31. _lineRep = lineRep;
  32. _sysUserRep = sysUserRep;
  33. }
  34. public async Task<object> GetDepartmentsAsync(S8TrustedScope scope) =>
  35. await _deptRep.AsQueryable()
  36. .Where(x => x.FactoryRefId == scope.FactoryId)
  37. .Take(500)
  38. .Select(x => new { id = x.Id, code = x.Department, name = x.Descr ?? x.Department })
  39. .ToListAsync();
  40. public async Task<object> GetEmployeesAsync(S8TrustedScope scope)
  41. {
  42. // S8 选员工下拉:EmployeeMaster.tenant_id 与 SysUser.TenantId 历史错位(业务租户 ≠ 系统租户),
  43. // 走全局 multi-tenant filter 会全过滤为空,故必须 ClearFilter;
  44. // 但边界**只能**来自可信作用域的 factoryId + IsActive,绝不接受调用方传入的 factoryRefId。
  45. var emps = await _empRep.AsQueryable().ClearFilter()
  46. .Where(x => x.FactoryRefId == scope.FactoryId && x.IsActive)
  47. .Take(500)
  48. .Select(x => new { x.Id, x.Name, x.Employee, x.SysUserId })
  49. .ToListAsync();
  50. var sysUserIds = emps.Where(e => e.SysUserId.HasValue && e.SysUserId.Value > 0)
  51. .Select(e => e.SysUserId!.Value).Distinct().ToList();
  52. Dictionary<long, (string? RealName, string? Account)> userMap = new();
  53. if (sysUserIds.Count > 0)
  54. {
  55. // 姓名水合:主键集合 + 可信租户双重边界(原实现只有主键集合)。
  56. var users = await _sysUserRep.AsQueryable().ClearFilter()
  57. .Where(u => sysUserIds.Contains(u.Id) && u.TenantId == scope.TenantId)
  58. .Select(u => new { u.Id, u.RealName, u.Account })
  59. .ToListAsync();
  60. userMap = users.ToDictionary(u => u.Id, u => ((string?)u.RealName, (string?)u.Account));
  61. }
  62. return emps.Select(e =>
  63. {
  64. var bound = e.SysUserId.HasValue && e.SysUserId.Value > 0 && userMap.ContainsKey(e.SysUserId.Value);
  65. string? sysUserName = null;
  66. if (bound)
  67. {
  68. var (realName, account) = userMap[e.SysUserId!.Value];
  69. sysUserName = !string.IsNullOrWhiteSpace(realName) ? realName : account;
  70. }
  71. return new
  72. {
  73. id = e.Id,
  74. name = e.Name ?? e.Employee,
  75. empCode = e.Employee,
  76. sysUserId = e.SysUserId,
  77. sysUserName,
  78. bindStatus = bound ? "BOUND" : "UNBOUND"
  79. };
  80. }).ToList();
  81. }
  82. public async Task<object> GetLinesAsync(S8TrustedScope scope) =>
  83. await _lineRep.AsQueryable()
  84. .Where(x => x.FactoryRefId == scope.FactoryId)
  85. .Take(500)
  86. .Select(x => new { id = x.Id, code = x.Line, name = x.Describe ?? x.Line })
  87. .ToListAsync();
  88. }