修改bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AreaController.cs

@@ -22,14 +22,14 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetAreaList()
         {
-            int userId = CurrentUser.UserData.F_UserId;
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            //int userId = CurrentUser.UserData.F_UserId;
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
             string where = " F_IsDelete=0 ";
-            if (!string.IsNullOrEmpty(userModel.groupcode))
-            {
-                where += " and F_GroupCode = '" + userModel.groupcode + "'";
-            }
+            //if (!string.IsNullOrEmpty(userModel.groupcode))
+            //{
+            //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
+            //}
 
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
             return Success("加载成功", dt);
@@ -41,14 +41,14 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetAreaListById(int id = 0)
         {
-            int userId = CurrentUser.UserData.F_UserId;
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            //int userId = CurrentUser.UserData.F_UserId;
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
             string where = " isnull(F_ParentId,0)='" + id + "' and F_IsDelete=0 ";
-            if (!string.IsNullOrEmpty(userModel.groupcode))
-            {
-                where += " and F_GroupCode = '" + userModel.groupcode + "'";
-            }
+            //if (!string.IsNullOrEmpty(userModel.groupcode))
+            //{
+            //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
+            //}
 
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
             return Success("列表加载成功", dt);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -263,6 +263,7 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         id = valueModel.F_DictionaryValueId,
                         dicflag = valueModel.F_DictionaryFlag,
+                        value = valueModel.F_ValueCode,
                         name = valueModel.F_Name,
                         remark = valueModel.F_Describe,
                         sort = valueModel.F_Sort,
@@ -286,10 +287,10 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
                 BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
 
-                orderModel.F_Name = input.DicvName;
+                orderModel.F_Name = input.DicVName;
                 orderModel.F_Describe = input.DicDes;
                 orderModel.F_State = true;
-                orderModel.F_ValueCode = "";
+                orderModel.F_ValueCode = input.DicValue;
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_Sort = input.Sort;
                 orderModel.F_GroupCode = userModel.groupcode;
@@ -313,9 +314,9 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_DictionaryValue orderModel = orderBll.GetModel(input.DicVid);
                 if (orderModel == null)
                     return Error("字典值对象获取失败");
-                orderModel.F_Name = input.DicvName;
+                orderModel.F_Name = input.DicVName;
                 orderModel.F_Describe = input.DicDes;
-                orderModel.F_ValueCode = "";
+                orderModel.F_ValueCode = input.DicValue;
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_Sort = input.Sort;
                 if (orderBll.Update(orderModel))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/DictionaryInput.cs

@@ -19,7 +19,8 @@ namespace CallCenterApi.Interface.Models.Input
     {
         public int DicVid { get; set; }
         public string DicFlag { get; set; }
-        public string DicvName { get; set; }
+        public string DicVName { get; set; }
+        public string DicValue { get; set; }
         public int Sort { get; set; } = 0;
         public string DicDes { get; set; }
     }