feat(hjgl): 完善焊接任务与质量管理流程

2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
@@ -20,6 +20,8 @@ namespace BLL
            {
                var getUser = from x in db.SitePerson_Person
                              join y in db.Person_Persons on x.IdentityCard equals y.IdentityCard
+                              join team in db.ProjectData_TeamGroup on x.TeamGroupId equals team.TeamGroupId into teamGroup
+                              from team in teamGroup.DefaultIfEmpty()
                              where (y.Telephone == userInfo.Account || x.PersonName == userInfo.Account)
                              && (y.Password == Funs.EncryptionPassword(userInfo.Password)
                                 || (x.IdentityCard != null && x.IdentityCard.Substring(x.IdentityCard.Length - 4) == userInfo.Password))
@@ -35,6 +37,8 @@ namespace BLL
                                  IdentityCard = x.IdentityCard,
                                  Account = y.Telephone,
                                  UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
+                                  TeamGroupId = x.TeamGroupId,
+                                  TeamGroupName = team == null ? string.Empty : team.TeamGroupName,
                                  LoginProjectName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
                                  Telephone = y.Telephone,
                                  WorkPostId = x.WorkPostId,
@@ -1626,4 +1630,4 @@ namespace BLL
        }

    }
-}
+}