浏览代码

修复创客-首页-经营范围
创客-首页-进件查询-详情支付宝状态显示问题

lcl 1 年之前
父节点
当前提交
3a1561957d

+ 2 - 1
Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -307,7 +307,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 item.Add("value", dicf["Id"].ToString());
                 item.Add("text", dicf["KindName"].ToString());
                 List<Dictionary<string, object>> sublist = new List<Dictionary<string, object>>();
-                List<Dictionary<string, object>> lists = BusinessScopeService.List(relationData, "and KindId='" + dicf["Id"].ToString() + "'", 1, 99999);
+                List<Dictionary<string, object>> lists = BusinessScopeService.List(relationData, " and KindId='" + dicf["Id"].ToString() + "'", 1, 99999);
                 foreach (Dictionary<string, object> dics in lists)
                 {
                     Dictionary<string, object> subitem = new Dictionary<string, object>();
@@ -315,6 +315,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     subitem.Add("text", dics["Name"].ToString());
                     sublist.Add(subitem);
                 }
+                item.Add("children", sublist);
                 dataList.Add(item);
             }
             return dataList;

+ 1 - 1
Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -114,7 +114,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             WeChat.Add("SignUrl", addInfo.WeChatSignUrl);
             AuditResult.Add(WeChat);
 
-            if(addInfo.QueryCount == -1 || addInfo.QueryCount == 1)
+            if(addInfo.QueryCount == -1 || addInfo.QueryCount >= 1)
             {
                 Dictionary<string, object> Alipay = new Dictionary<string, object>();
                 Alipay.Add("Name", "支付宝");