代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -16,8 +16,8 @@ namespace BLL
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var getUser = db.Person_Persons.FirstOrDefault(x =>( x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account)
|
||||
&& x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true)
|
||||
var getUser = db.Person_Persons.FirstOrDefault(x => (x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account)
|
||||
&& x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true)
|
||||
&& (x.Account.Length > 1 || x.PersonId == Const.hfnbdId || x.PersonId == Const.sysglyId));
|
||||
if (getUser != null)
|
||||
{
|
||||
@@ -107,8 +107,8 @@ namespace BLL
|
||||
{
|
||||
var getUser = (from x in db.Person_Persons
|
||||
join y in db.Sys_Role on x.RoleIds equals y.RoleId
|
||||
where x.UnitId == unitId && x.IsPost == true && (strParam == null || x.PersonName.Contains(strParam))
|
||||
&& x.RoleIds .Length > 1 && x.Account.Length > 1
|
||||
where x.UnitId == unitId && x.IsPost == true && (strParam == null || x.PersonName.Contains(strParam))
|
||||
&& x.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
orderby x.PersonName
|
||||
select new Model.BaseInfoItem { BaseInfoId = x.PersonId, BaseInfoName = x.PersonName, BaseInfoCode = x.Telephone }).ToList();
|
||||
|
||||
@@ -131,10 +131,10 @@ namespace BLL
|
||||
List<string> roleList = Funs.GetStrListByStr(roleIds, ',');
|
||||
if (!string.IsNullOrEmpty(projectId))
|
||||
{
|
||||
var getDatas = from x in db.Person_Persons
|
||||
var getDatas = from x in db.Person_Persons
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds.Length>1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
Account = x.Account,
|
||||
@@ -173,27 +173,27 @@ namespace BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
var getPersons =from x in db.Person_Persons
|
||||
where x.IsPost == true && x.RoleIds.Length>1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
Account = x.Account,
|
||||
UserCode = x.JobNum,
|
||||
Password = x.Password,
|
||||
PersonName = x.PersonName,
|
||||
RoleId = x.RoleIds,
|
||||
RoleName = db.Sys_Role.First(z => z.RoleId == x.RoleIds).RoleName,
|
||||
UnitId = x.UnitId,
|
||||
UnitName = db.Base_Unit.First(z => z.UnitId == x.UnitId).UnitName,
|
||||
//LoginProjectId = y.ProjectId,
|
||||
//LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
|
||||
IdentityCard = x.IdentityCard,
|
||||
Email = x.Email,
|
||||
Telephone = x.Telephone,
|
||||
IsOffice = x.IsOffice,
|
||||
SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
|
||||
};
|
||||
var getPersons = from x in db.Person_Persons
|
||||
where x.IsPost == true && x.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
Account = x.Account,
|
||||
UserCode = x.JobNum,
|
||||
Password = x.Password,
|
||||
PersonName = x.PersonName,
|
||||
RoleId = x.RoleIds,
|
||||
RoleName = db.Sys_Role.First(z => z.RoleId == x.RoleIds).RoleName,
|
||||
UnitId = x.UnitId,
|
||||
UnitName = db.Base_Unit.First(z => z.UnitId == x.UnitId).UnitName,
|
||||
//LoginProjectId = y.ProjectId,
|
||||
//LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
|
||||
IdentityCard = x.IdentityCard,
|
||||
Email = x.Email,
|
||||
Telephone = x.Telephone,
|
||||
IsOffice = x.IsOffice,
|
||||
SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
|
||||
};
|
||||
|
||||
if (!string.IsNullOrEmpty(unitId))
|
||||
{
|
||||
@@ -236,7 +236,7 @@ namespace BLL
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
|
||||
where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
|
||||
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Length>1 && x.Account.Length > 1
|
||||
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
@@ -268,7 +268,7 @@ namespace BLL
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
|
||||
where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
|
||||
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item) && y.RoleIds.Length>1 && x.Account.Length > 1
|
||||
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item) && y.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
@@ -348,7 +348,7 @@ namespace BLL
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var getUser = db.Person_Persons.FirstOrDefault(x => x.PersonId == personId);
|
||||
if (getUser != null&&!string .IsNullOrEmpty(SignatureUrl))
|
||||
if (getUser != null && !string.IsNullOrEmpty(SignatureUrl))
|
||||
{
|
||||
getUser.SignatureUrl = SignatureUrl;
|
||||
db.SubmitChanges();
|
||||
@@ -445,7 +445,7 @@ namespace BLL
|
||||
{
|
||||
var getDatas = (from x in db.Person_Persons
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds.Length>1 && x.Account.Length > 1
|
||||
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds.Length > 1 && x.Account.Length > 1
|
||||
select new Model.UserItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
|
||||
Reference in New Issue
Block a user