后台辅助工具-查询商户型创客信息，增加按创客编号查询功能

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -780,6 +780,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "商户编号不存在";
             }
             pos.SeoTitle = user.Id.ToString();
+            pos.UserId = user.Id;
             if (pos.BindMerchantId == 0)
             {
                 pos.BindMerchantId = merchant.Id;
@@ -1704,10 +1705,19 @@ namespace MySystem.Areas.Admin.Controllers
         {
             if (string.IsNullOrEmpty(PosSn))
             {
-                return "请输入机具SN";
+                return "请输入机具SN或者创客编号";
             }
-            SetMerchantTypeRecord pos = db.SetMerchantTypeRecord.FirstOrDefault(m => m.PosSn == PosSn);
-            if (pos == null)
+            SetMerchantTypeRecord pos = new SetMerchantTypeRecord();
+            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();
+            }
+            else
+            {
+                pos = db.SetMerchantTypeRecord.FirstOrDefault(m => m.PosSn == PosSn) ?? new SetMerchantTypeRecord();
+            }
+            if (pos.Id == 0)
             {
                 return "查无信息";
             }

Areas/Admin/Views/MainServer/SysTools/SeeMerchantType.cshtml

@@ -28,11 +28,11 @@
                         <div class="layui-tab-content mt20">
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">机具SN</label>
+                                    <label class="layui-form-label">机具SN/创客编号</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="PosSn"
                                             name="PosSn" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入机具SN">
+                                            autocomplete="off" placeholder="请输入机具SN/创客编号">
                                     </div>
                                 </div>
                             </div>

Controllers/HomeController.cs

@@ -44,7 +44,6 @@ namespace MySystem.Controllers
             return View();
         }
 
-
         
     }
 }