暂存箱分页功能调整

进件检查重复商户名提示

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -223,13 +223,18 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             else
             {
-                if (SubjectType != "SUBJECT_TYPE_SMALL")
+                if (SubjectType == "SUBJECT_TYPE_SMALL")
                 {
-                    Fields.Add("CertMerchantName", CertMerchantName);
+                    var check = MerchantAddInfoService.Query(" CertMerchantName like '" + CertMerchantName + "%' and Status<1 and QueryCount<1");
+                    if (check.Id > 0)
+                    {
+                        return new AppResultJson() { Status = "-1", Info = "该商户已暂存或进件，忽重复进件！", Data = Obj };
+                    }
+                    CertMerchantName = MerchantInfoService.Query(MerchantAddInfoId).Name;
                 }
                 else
                 {
-                    CertMerchantName = MerchantInfoService.Query(MerchantAddInfoId).Name;
+                    Fields.Add("CertMerchantName", CertMerchantName);
                 }
             }
             // var ActivitiesId = "20191030111cff5b5e";

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -635,8 +635,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Sort == 0).ToList();
-            foreach (var subdata in query)
+            IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Sort == 0);
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("Name", subdata.Name); //名称