运营中心查询添加条件

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -61,12 +61,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 运营中心列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SysAdmin data, string OpCode, string RealName, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(SysAdmin data, string OpCode, string MakerCode, string MakerName, string UserType, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("RealName", "2"); //名称
+            Fields.Add("RealName", "1"); //名称
 
             string condition = " and Status>-1 and Sort>0 and QueryCount>0 and AdminName!='admin'";
             //运营中心编号
@@ -74,6 +74,37 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Id in (select OpId from OperateForCode where OpCode='" + OpCode + "')";
             }
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Models.Users();
+                condition += " and UserId=" + user.Id;
+            }
+            //创客姓名
+            if (!string.IsNullOrEmpty(MakerName))
+            {
+                var user = db.Users.Where(m => m.RealName == MakerName).ToList();
+                var userIds = "";
+                foreach (var item in user)
+                {
+                    userIds += item.Id + ",";
+                };
+                userIds = userIds.TrimEnd(',');
+                condition += " and UserId in (" + userIds + ")";
+            }
+            //合伙人类型
+            if (!string.IsNullOrEmpty(UserType))
+            {
+                var type = int.Parse(UserType);
+                var user = db.Users.Where(m => m.UserType == type).ToList();
+                var userIds = "";
+                foreach (var item in user)
+                {
+                    userIds += item.Id + ",";
+                };
+                userIds = userIds.TrimEnd(',');
+                condition += " and UserId in (" + userIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -96,8 +127,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (userInfo.UserType == 2) dic["Kind"] = "黄金合伙人";
                 if (userInfo.UserType == 3) dic["Kind"] = "钻石合伙人";
                 if (userInfo.UserType == 4) dic["Kind"] = "战略合伙人";
-                dic["MakerCode"] = userInfo.MakerCode;
-                dic["RealName"] = userInfo.RealName;
+                dic["MakerForCode"] = userInfo.MakerCode;
+                dic["MakerForName"] = userInfo.RealName;
 
                 //登陆地址
                 dic["LoginUrl"] = OpHost + "Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345").Replace("/", "%2F") + "/Login";

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -51,10 +51,33 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">名称</label>
+                        <label class="layui-form-label">运营中心名称</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="RealName" placeholder="" autocomplete="off">
                         </div>
+                    </div><div class="layui-inline">
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MakerCode" placeholder="" autocomplete="off">
+                        </div>
+                    </div><div class="layui-inline">
+                        <label class="layui-form-label">创客姓名</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MakerName" placeholder="" autocomplete="off">
+                        </div>
+                    </div><div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">合伙人类型</label>
+                            <div class="layui-input-inline">
+                                <select id="UserType" name="UserType">
+                                    <option value="">请选择</option>
+                                    <option value="1">运营中心</option>
+                                    <option value="2">黄金合伙人</option>
+                                    <option value="3">钻石合伙人</option>
+                                    <option value="4">战略合伙人</option>
+                                </select>
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -120,11 +120,11 @@ layui.config({
                 title: '名称',
                 sort: true
             }, {
-                field: 'MakerCode',
+                field: 'MakerForCode',
                 title: '所属创客编号',
                 sort: true
             }, {
-                field: 'MakerName',
+                field: 'MakerForName',
                 title: '所属真实姓名',
                 sort: true
             }, {