修改单位bug

CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

@@ -32,15 +32,15 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-		/// 增加一条数据
-		/// </summary>
-		public int Add(CallCenterApi.Model.T_Sys_Department model)
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Sys_Department model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_Department(");
-            strSql.Append("F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept)");
+            strSql.Append("F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept)");
             strSql.Append(" values (");
-            strSql.Append("@F_DeptName,@F_DeptNameSpell,@F_DeptNameSpells,@F_DeptPhone,@F_DeptPhone2,@F_DeptTelphone,@F_PartentId,@F_layer,@F_Sort,@F_Type,@F_Address,@F_Remark,@F_LeaderUser,@F_LeaderUserName,@F_TopSplitUser,@F_TopSplitUserName,@F_TopLeaderUser,@F_TopLeaderUserName,@F_State,@F_CreateUser,@F_CreateDate,@F_IsDept)");
+            strSql.Append("@F_DeptName,@F_DeptNameSpell,@F_DeptNameSpells,@F_DeptPhone,@F_DeptPhone2,@F_DeptTelphone,@F_PartentId,@F_layer,@F_Sort,@F_Type,@F_Address,@F_Remark,@F_LeaderUser,@F_LeaderUserName,@F_TopSplitUser,@F_TopSplitUserName,@F_TopLeaderUser,@F_TopLeaderUserName,@F_State,@F_CreateUser,@F_CreateDate,@F_IsDept,@F_IsDealDept)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptName", SqlDbType.NVarChar,100),
@@ -64,7 +64,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
-                    new SqlParameter("@F_IsDept", SqlDbType.Int,4)};
+                    new SqlParameter("@F_IsDept", SqlDbType.Int,4),
+                    new SqlParameter("@F_IsDealDept", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DeptName;
             parameters[1].Value = model.F_DeptNameSpell;
             parameters[2].Value = model.F_DeptNameSpells;
@@ -87,6 +88,7 @@ namespace CallCenterApi.DAL
             parameters[19].Value = model.F_CreateUser;
             parameters[20].Value = model.F_CreateDate;
             parameters[21].Value = model.F_IsDept;
+            parameters[22].Value = model.F_IsDealDept;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -126,7 +128,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_State=@F_State,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
             strSql.Append("F_CreateDate=@F_CreateDate,");
-            strSql.Append("F_IsDept=@F_IsDept");
+            strSql.Append("F_IsDept=@F_IsDept,");
+            strSql.Append("F_IsDealDept=@F_IsDealDept");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptName", SqlDbType.NVarChar,100),
@@ -151,6 +154,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDept", SqlDbType.Int,4),
+                    new SqlParameter("@F_IsDealDept", SqlDbType.Int,4),
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DeptName;
             parameters[1].Value = model.F_DeptNameSpell;
@@ -174,7 +178,8 @@ namespace CallCenterApi.DAL
             parameters[19].Value = model.F_CreateUser;
             parameters[20].Value = model.F_CreateDate;
             parameters[21].Value = model.F_IsDept;
-            parameters[22].Value = model.F_DeptId;
+            parameters[22].Value = model.F_IsDealDept;
+            parameters[23].Value = model.F_DeptId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -238,7 +243,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 * from T_Sys_Department ");
+            strSql.Append("select  top 1 F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept from T_Sys_Department ");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)
@@ -259,9 +264,9 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-		/// 得到一个对象实体
-		/// </summary>
-		public CallCenterApi.Model.T_Sys_Department DataRowToModel(DataRow row)
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Department DataRowToModel(DataRow row)
         {
             CallCenterApi.Model.T_Sys_Department model = new CallCenterApi.Model.T_Sys_Department();
             if (row != null)
@@ -358,6 +363,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsDept = int.Parse(row["F_IsDept"].ToString());
                 }
+                if (row["F_IsDealDept"] != null && row["F_IsDealDept"].ToString() != "")
+                {
+                    model.F_IsDealDept = int.Parse(row["F_IsDealDept"].ToString());
+                }
             }
             return model;
         }
@@ -368,7 +377,8 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select *  FROM T_Sys_Department ");
+            strSql.Append("select F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept ");
+            strSql.Append(" FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -387,8 +397,8 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-
-            strSql.Append(" * FROM T_Sys_Department ");
+            strSql.Append(" F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept ");
+            strSql.Append(" FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -21,10 +21,17 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetDeptList()
+        public ActionResult GetDeptList(int iscbdw = 0)
         {
             DataTable dt = new DataTable();
-            dt = departmentBLL.GetList(0, "F_State=0", " F_Sort").Tables[0];
+            if (iscbdw == 0)
+            {
+                dt = departmentBLL.GetList(0, "F_State=0", " F_Sort").Tables[0];
+            }
+            else
+            {
+                dt = departmentBLL.GetList(0, "F_State=0 and  ISNULL(F_IsDealDept, '0') ='1'", " F_Sort").Tables[0];
+            }
             return Success("加载成功", dt);
         }
 
@@ -114,6 +121,7 @@ namespace CallCenterApi.Interface.Controllers
             int did = RequestString.GetInt("did", 0);
             int sort = RequestString.GetInt("sort", 0);
             int isdept = RequestString.GetInt("isdept", 0);
+            int isdealdept = RequestString.GetInt("isdealdept", 0);
             string name = RequestString.GetFormString("name");
             string phone = RequestString.GetFormString("phone");
             string leader = RequestString.GetFormString("leader");
@@ -141,6 +149,7 @@ namespace CallCenterApi.Interface.Controllers
                     dModel.F_TopLeaderUser = topleader;
                     dModel.F_State = 0;
                     dModel.F_IsDept = isdept;
+                    dModel.F_IsDealDept = isdealdept;
                     dModel.F_CreateDate = DateTime.Now;
                     dModel.F_CreateUser = userModel.F_UserCode;
                     int n = departmentBLL.Add(dModel);
@@ -170,6 +179,7 @@ namespace CallCenterApi.Interface.Controllers
                         dModel.F_TopSplitUser = split;
                         dModel.F_TopLeaderUser = topleader;
                         dModel.F_IsDept = isdept;
+                        dModel.F_IsDealDept = isdealdept;
                         if (departmentBLL.Update(dModel))
                             return Success("修改成功");
                         else

CallCenterApi/CallCenterApi.Model/T_Sys_Department.cs

@@ -33,6 +33,7 @@ namespace CallCenterApi.Model
         private string _f_createuser;
         private DateTime? _f_createdate;
         private int? _f_isdept;
+        private int? _f_isdealdept;
         /// <summary>
         /// 部门id，自增
         /// </summary>
@@ -210,13 +211,21 @@ namespace CallCenterApi.Model
             get { return _f_createdate; }
         }
         /// <summary>
-        /// 0：单位分类     1：单位
+        /// 
         /// </summary>
         public int? F_IsDept
         {
             set { _f_isdept = value; }
             get { return _f_isdept; }
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_IsDealDept
+        {
+            set { _f_isdealdept = value; }
+            get { return _f_isdealdept; }
+        }
         #endregion Model
 
     }