wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:17c6cf4deef4ffc63c6c661c536d6323bc76dc38
Branches Tags
wyw:master
..
compare: wyw:be9f3debc14752e4568442fcb05219298e6a1284
Branches Tags
wyw:master

No commits in common. "17c6cf4deef4ffc63c6c661c536d6323bc76dc38" and "be9f3debc14752e4568442fcb05219298e6a1284" have entirely different histories.
17c6cf4dee ... be9f3debc1

2 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

5
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -1579,11 +1579,10 @@ namespace APT.FM.WebApi.Controllers.Api.FM
var orgIDGUID = new Guid(filter.Parameter1);
using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"]))
{
var tennant = context.GetEntity<T_OP_TENANT>(t => t.ID == orgIDGUID, new string[] { "CODE" }).CODE;
var allUser = context.GetEntity<T_OP_ALLUSER>(t => t.CODE == user.CODE, new string[] { "ID", "CODE", "ORG_ID", "TENANT", "PHONE" });
var allUser = context.GetEntity<T_OP_ALLUSER>(t => t.CODE == user.CODE, new string[] { "ID,CODE,ORG_ID,TENANT" });
if (allUser != null)
{
allUser.TENANT = tennant;
allUser.TENANT = filter.Parameter1.Substring(0,3);
allUser.ORG_ID = orgIDGUID;
context.UpdateEntity(allUser);
context.SaveChanges();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -105,7 +105,7 @@ namespace APT.SK.WebApi.Controllers.Api
confirm.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)userName?.Nav_Department?.DEPARTMENT_TYPE;
if (files != null && files.Any())
{
foreach (var file in files.Where(t=>t.IS_DELETED == false).ToList())
foreach (var file in files)
{
T_SK_HIDDEN_DANGER_CONFIRM_PHOTO photo = new T_SK_HIDDEN_DANGER_CONFIRM_PHOTO();
photo.ORG_ID = file.ORG_ID;