ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wjn 2024-04-10 09:29:18 +08:00
commit 331c54e852
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -968,14 +968,17 @@ namespace APT.FO.WebApi.Controllers
}
else
{
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
}
}
}

17
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -456,14 +456,17 @@ namespace APT.FO.WebApi.Controllers
}
else
{
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null)
{
if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; }
else if (dep.CHARGEUSER_ID.HasValue)
{ approveId = dep.CHARGEUSER_ID.Value; }
break;
}
}
}
}