修改bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -36,7 +36,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 DataTable dt = new DataTable();
 
                 //分组代码
-                string strcode = RequestString.GetQueryString("code");
+                string code = RequestString.GetFormString("code");
                 //类型
                 int type = RequestString.GetInt("type", 0);
                 //联系人
@@ -58,17 +58,11 @@ namespace CallCenterApi.Interface.Controllers.customer
                 string strpagesize = RequestString.GetQueryString("pagesize");
                 int pagesize = 10;
 
-                if (userModel.rolecode != "XTGLY")
+                if (string.IsNullOrEmpty(code) && !string.IsNullOrEmpty(userModel.groupcode))
                 {
                     sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
                 }
-                else
-                {
-                    if (strcode.Trim() != "" && strcode != "undefined")
-                    {
-                        sql += " and F_GroupCode = '" + strcode + "' ";
-                    }
-                }
+
                 if (type!=0)
                 {
                     sql += " and F_Type = '" + type + "' ";
@@ -150,7 +144,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
                 //分组代码
-                string strcode = RequestString.GetQueryString("code");
+                string code = RequestString.GetFormString("code");
                 //类型
                 int type = RequestString.GetInt("type", 0);
                 //关键词
@@ -162,14 +156,11 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //城市
                 string strcity = RequestString.GetQueryString("city");
 
-                if (userModel.rolecode != "XTGLY")
-                {
-                    strcode= userModel.groupcode ;
-                }
+
                 string sql = " F_IsDelete=0";
-                if (strcode.Trim() != "" && strcode != "undefined")
+                if (string.IsNullOrEmpty(code) && !string.IsNullOrEmpty(userModel.groupcode))
                 {
-                    sql += " and F_GroupCode = '" + strcode + "' ";
+                    sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
                 }
                 if (type != 0)
                 {
@@ -274,7 +265,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //id
                 int id = RequestString.GetInt("id", 0);
                 //分组代码
-                string strcode = RequestString.GetFormString("code");
+                string code = RequestString.GetFormString("code");
                 //类型
                 int type = RequestString.GetInt("type", 0);
                 //联系人
@@ -288,17 +279,14 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //城市
                 string strcity = RequestString.GetFormString("city");
 
-                if (userModel.rolecode != "XTGLY")
-                {
-                    strcode = userModel.groupcode;
-                }
 
                 Model.T_Cus_Customer model = new Model.T_Cus_Customer();
                 BLL.T_Cus_Customer bll = new BLL.T_Cus_Customer();
 
                 if (id == 0)
                 {
-                    model.F_GroupCode = strcode;
+                    model.F_GroupCode = string.IsNullOrEmpty(code) ? userModel.groupcode : code;
+
                     model.F_Type = type;
                     model.F_Name = strname;
                     model.F_Phone = strtel;
@@ -324,7 +312,10 @@ namespace CallCenterApi.Interface.Controllers.customer
                     model = bll.GetModel(id);
                     if (model != null)
                     {
-                        model.F_GroupCode = strcode;
+                        if (!string.IsNullOrEmpty(code))
+                        {
+                            model.F_GroupCode = code;
+                        }
                         model.F_Type = type;
                         model.F_Name = strname;
                         model.F_Phone = strtel;
@@ -419,7 +410,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //类型
                 int type = RequestString.GetInt("type", 0);
 
-                if (userModel.rolecode != "XTGLY")
+                if (string.IsNullOrEmpty(code))
                 {
                     code = userModel.groupcode;
                 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -79,7 +79,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             string where = " F_IsDelete=0 and datediff(day,F_CreateTime,'" + stime + "')>=0 "
                 + " and datediff(day,F_CreateTime,'" + etime + "')<=0 and F_Type=F_DictionaryValueId ";
-            if (userModel.rolecode != "XTGLY")
+            if (!string.IsNullOrEmpty(userModel.groupcode))
             {
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
             }
@@ -112,7 +112,7 @@ namespace CallCenterApi.Interface.Controllers.report
             string strcity = RequestString.GetQueryString("city");
 
             string where = " F_IsDelete=0 and datediff(month,F_CreateTime,getdate())<=12 ";
-            if (userModel.rolecode != "XTGLY")
+            if (!string.IsNullOrEmpty(userModel.groupcode))
             {
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -363,7 +363,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string cusphone = RequestString.GetFormString("cusphone");
             //分组代码
             string code = RequestString.GetQueryString("code");
-            if (userModel.rolecode != "XTGLY")
+            if (!string.IsNullOrEmpty(userModel.groupcode))
             {
                 code = userModel.groupcode;
             }
@@ -512,10 +512,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string cusphone = RequestString.GetFormString("cusphone");
             //分组代码
             string code = RequestString.GetQueryString("code");
-            if (userModel.rolecode != "XTGLY")
-            {
-                code = userModel.groupcode;
-            }
             //事件描述
             string content = RequestString.GetQueryString("content");
             //产品名称
@@ -575,7 +571,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
                     modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
                     modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
-                    modelT_Bus_WorkOrder.F_GroupCode = code;//分组代码
+                    if (!string.IsNullOrEmpty(code))
+                    {
+                        modelT_Bus_WorkOrder.F_GroupCode = code;//分组代码
+                    }
                     modelT_Bus_WorkOrder.F_Content = content;//事件描述
                     modelT_Bus_WorkOrder.F_ProductName = productname;//产品名称
                     modelT_Bus_WorkOrder.F_BuyDate = buydate;//购买日期