浏览代码

修改bug

zhoufan 7 年之前
父节点
当前提交
98ce6ec49b

+ 12 - 12
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AreaController.cs

22
         /// <returns></returns>
22
         /// <returns></returns>
23
         public ActionResult GetAreaList()
23
         public ActionResult GetAreaList()
24
         {
24
         {
25
-            int userId = CurrentUser.UserData.F_UserId;
26
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
25
+            //int userId = CurrentUser.UserData.F_UserId;
26
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
27
 
27
 
28
             string where = " F_IsDelete=0 ";
28
             string where = " F_IsDelete=0 ";
29
-            if (!string.IsNullOrEmpty(userModel.groupcode))
30
-            {
31
-                where += " and F_GroupCode = '" + userModel.groupcode + "'";
32
-            }
29
+            //if (!string.IsNullOrEmpty(userModel.groupcode))
30
+            //{
31
+            //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
32
+            //}
33
 
33
 
34
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
34
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
35
             return Success("加载成功", dt);
35
             return Success("加载成功", dt);
41
         /// <returns></returns>
41
         /// <returns></returns>
42
         public ActionResult GetAreaListById(int id = 0)
42
         public ActionResult GetAreaListById(int id = 0)
43
         {
43
         {
44
-            int userId = CurrentUser.UserData.F_UserId;
45
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
44
+            //int userId = CurrentUser.UserData.F_UserId;
45
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
46
 
46
 
47
             string where = " isnull(F_ParentId,0)='" + id + "' and F_IsDelete=0 ";
47
             string where = " isnull(F_ParentId,0)='" + id + "' and F_IsDelete=0 ";
48
-            if (!string.IsNullOrEmpty(userModel.groupcode))
49
-            {
50
-                where += " and F_GroupCode = '" + userModel.groupcode + "'";
51
-            }
48
+            //if (!string.IsNullOrEmpty(userModel.groupcode))
49
+            //{
50
+            //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
51
+            //}
52
 
52
 
53
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
53
             DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
54
             return Success("列表加载成功", dt);
54
             return Success("列表加载成功", dt);

+ 5 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

263
                     {
263
                     {
264
                         id = valueModel.F_DictionaryValueId,
264
                         id = valueModel.F_DictionaryValueId,
265
                         dicflag = valueModel.F_DictionaryFlag,
265
                         dicflag = valueModel.F_DictionaryFlag,
266
+                        value = valueModel.F_ValueCode,
266
                         name = valueModel.F_Name,
267
                         name = valueModel.F_Name,
267
                         remark = valueModel.F_Describe,
268
                         remark = valueModel.F_Describe,
268
                         sort = valueModel.F_Sort,
269
                         sort = valueModel.F_Sort,
286
                 Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
287
                 Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
287
                 BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
288
                 BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
288
 
289
 
289
-                orderModel.F_Name = input.DicvName;
290
+                orderModel.F_Name = input.DicVName;
290
                 orderModel.F_Describe = input.DicDes;
291
                 orderModel.F_Describe = input.DicDes;
291
                 orderModel.F_State = true;
292
                 orderModel.F_State = true;
292
-                orderModel.F_ValueCode = "";
293
+                orderModel.F_ValueCode = input.DicValue;
293
                 orderModel.F_DictionaryFlag = input.DicFlag;
294
                 orderModel.F_DictionaryFlag = input.DicFlag;
294
                 orderModel.F_Sort = input.Sort;
295
                 orderModel.F_Sort = input.Sort;
295
                 orderModel.F_GroupCode = userModel.groupcode;
296
                 orderModel.F_GroupCode = userModel.groupcode;
313
                 Model.T_Sys_DictionaryValue orderModel = orderBll.GetModel(input.DicVid);
314
                 Model.T_Sys_DictionaryValue orderModel = orderBll.GetModel(input.DicVid);
314
                 if (orderModel == null)
315
                 if (orderModel == null)
315
                     return Error("字典值对象获取失败");
316
                     return Error("字典值对象获取失败");
316
-                orderModel.F_Name = input.DicvName;
317
+                orderModel.F_Name = input.DicVName;
317
                 orderModel.F_Describe = input.DicDes;
318
                 orderModel.F_Describe = input.DicDes;
318
-                orderModel.F_ValueCode = "";
319
+                orderModel.F_ValueCode = input.DicValue;
319
                 orderModel.F_DictionaryFlag = input.DicFlag;
320
                 orderModel.F_DictionaryFlag = input.DicFlag;
320
                 orderModel.F_Sort = input.Sort;
321
                 orderModel.F_Sort = input.Sort;
321
                 if (orderBll.Update(orderModel))
322
                 if (orderBll.Update(orderModel))

+ 2 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/DictionaryInput.cs

19
     {
19
     {
20
         public int DicVid { get; set; }
20
         public int DicVid { get; set; }
21
         public string DicFlag { get; set; }
21
         public string DicFlag { get; set; }
22
-        public string DicvName { get; set; }
22
+        public string DicVName { get; set; }
23
+        public string DicValue { get; set; }
23
         public int Sort { get; set; } = 0;
24
         public int Sort { get; set; } = 0;
24
         public string DicDes { get; set; }
25
         public string DicDes { get; set; }
25
     }
26
     }