Просмотр исходного кода

修复商户型创客设置信息查询

lichunlei 4 лет назад
Родитель
Сommit
c2c65790db
1 измененных файлов с 10 добавлено и 2 удалено
  1. 10 2
      Areas/Admin/Controllers/MainServer/SysToolsController.cs

+ 10 - 2
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1968,11 +1968,19 @@ namespace MySystem.Areas.Admin.Controllers
             if (PosSn.StartsWith("K"))
             {
                 UserForMakerCode userfor = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == PosSn) ?? new UserForMakerCode();
-                pos = db.SetMerchantTypeRecord.FirstOrDefault(m => m.ToUserId == userfor.UserId) ?? new SetMerchantTypeRecord();
+                bool check = db.SetMerchantTypeRecord.Any(m => m.ToUserId == userfor.UserId);
+                if(check)
+                {
+                    pos = db.SetMerchantTypeRecord.Where(m => m.ToUserId == userfor.UserId).OrderByDescending(m => m.Id).FirstOrDefault() ?? new SetMerchantTypeRecord();
+                }
             }
             else
             {
-                pos = db.SetMerchantTypeRecord.FirstOrDefault(m => m.PosSn == PosSn) ?? new SetMerchantTypeRecord();
+                bool check = db.SetMerchantTypeRecord.Any(m => m.PosSn == PosSn);
+                if(check)
+                {
+                    pos = db.SetMerchantTypeRecord.Where(m => m.PosSn == PosSn).OrderByDescending(m => m.Id).FirstOrDefault() ?? new SetMerchantTypeRecord();
+                }
             }
             if (pos.Id == 0)
             {