修改客户信息编号和公司名提醒bug

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

@@ -260,8 +260,18 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 添加验证判断
             if (string.IsNullOrEmpty(input.F_CustomerCode))
                 return Error("编号不能为空！");
-            if (getunique(0, input.F_CustomerCode, input.F_CompanyName))
-                return Error("编号已被占用，请重新输入！");
+            int b = 0;
+            if (getunique(0, input.F_CustomerCode, input.F_CompanyName, out b))
+            {
+                if (b > 0)
+                {
+                    return Error("公司名称已被占用，请重新输入！");
+                }
+                else
+                {
+                    return Error("编号已被占用，请重新输入！");
+                }
+            }
             #endregion
             var model = new Model.T_Cus_CustomerBaseNew();
             #region 保存客户基本信息
@@ -324,8 +334,18 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 添加验证判断
             if (input.F_CustomerId <= 0)
                 return Error("参数错误！");
-            if (getunique(input.F_CustomerId, input.F_CustomerCode, input.F_CompanyName))
-                return Error("编号已被占用，请重新输入！");
+            int b = 0;
+            if (getunique(0, input.F_CustomerCode, input.F_CompanyName, out b))
+            {
+                if (b > 0)
+                {
+                    return Error("公司名称已被占用，请重新输入！");
+                }
+                else
+                {
+                    return Error("编号已被占用，请重新输入！");
+                }
+            }
             #endregion
             var model = cusbll.GetModel(input.F_CustomerId);
             #region 保存客户基本信息
@@ -451,15 +471,34 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <summary>
         /// 验证客户编号是否唯一
         /// </summary>
-        private bool getunique(int id, string code,string name)
+        private bool getunique(int id, string code,string name,out int b)//是否公司名称重复
         {
             var sql = " F_DeleteFlag=0 ";
-            sql += "and (F_CustomerCode='" + code + "' or F_CompanyName='"+ name + "')";
+            var sql1 = " F_DeleteFlag=0 ";
+            sql += "and (F_CustomerCode='" + code + "')";
+            sql1 += "and ( F_CompanyName='" + name + "')";
             if (id > 0)
-                sql += " and F_CustomerId<>"+id;
+            {
+                sql += " and F_CustomerId<>" + id;
+                sql1 += " and F_CustomerId<>" + id;
+            }
             var count=cusbll.GetModelList(sql).Count();
-            
-            return count > 0;
+            var count1 = cusbll.GetModelList(sql1).Count();
+            if (count > 0)
+            {
+                b = 0;
+                return true;
+            }
+            else if (count1 > 0)
+            {
+                b = 1;
+                return true;
+            }
+            else
+            {
+                b = 0;
+                return count1 + count > 0;
+            }
         }
         /// <summary>
         /// 删除客户
@@ -867,7 +906,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                         cusmodel.F_CustomerCode = dataRow["编号"].ToString();
                         cusmodel.F_CompanyName = dataRow["公司名称"].ToString();
                         //判断编号唯一
-                        if (getunique(0, cusmodel.F_CustomerCode, cusmodel.F_CompanyName))
+                        int b = 0;
+                        if (getunique(0, cusmodel.F_CustomerCode, cusmodel.F_CompanyName,out b))
                             continue;
                         #region 处理关键字
                         var keyword = cusmodel.F_CompanyName;