bug

代码/System.Model/Sys/T_Sys_MediaCente.cs

@@ -20,7 +20,7 @@ namespace System.Model
         private string _f_phone;
         private string _f_commodity;
         private DateTime? _f_launchtime;
-        private float ? _f_dailyexpenses;
+        private float  _f_dailyexpenses;
         private string _f_playplan;
         private int? _f_isremind;
         private string _f_deptid;
@@ -93,7 +93,7 @@ namespace System.Model
         /// <summary>
         /// 日费用
         /// </summary>
-        public float? F_DailyExpenses
+        public float F_DailyExpenses
         {
             set { _f_dailyexpenses = value; }
             get { return _f_dailyexpenses; }

代码/System.Model/Sys/T_Sys_TaskManagement.cs

@@ -55,7 +55,7 @@ namespace System.Model
         /// <summary>
         /// 目标金额
         /// </summary>
-        public float? F_Money
+        public float F_Money
         { get; set; }
         /// <summary>
         /// 当前金额

代码/TVShoppingCallCenter_ZLJ/Controllers/IndexCategory/IndexCategoryController.cs

@@ -87,6 +87,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
                         if (parent != null)
                             model.F_Expand2 = parent.F_Expand2 += res + "|";
                     }
+                    var Expand = _qc_indexcategoryreposytory.Update(model);
                 }
               
              
@@ -113,11 +114,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
             input.F_CreateBy = model.F_CreateBy;
             input.F_CreateOn = model.F_CreateOn;
             input.F_Expand2 = "|" + input.F_CategoryId + "|";
+          
+
                 if (input.F_ParentId > 0)
                 {
                     var parent = _qc_indexcategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
                     if (parent != null)
+                  {
+                    string[] Expand = parent.F_Expand2.Split('|');
+                    if (Expand.Contains (input.F_CategoryId.ToString () ))
+                    {
+                        return Error("不能选择该分类的上级分类");
+                    }
+                    else 
                     input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
+                   }
+                    
                 }
            
             var b = await _qc_indexcategoryreposytory.Update(input);

代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

@@ -620,9 +620,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
             }
             task.F_DeptName = deptmsg;// 部门名称
             task.F_Tasker = it.F_Tasker;
-
-            task.F_TaskerName = _sys_useraccountRepository.GetSingle(x => x.F_UserId == it.F_Tasker).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserId == it.F_Tasker).Result .F_UserName  : "";
             task.F_Money = it.F_Money;
+            task.F_TaskerName = _sys_useraccountRepository.GetSingle(x => x.F_UserId == it.F_Tasker).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserId == it.F_Tasker).Result .F_UserName  : "";
             task.F_Currentamount = it.F_Currentamount;
             task.F_Taskprogress = it.F_Taskprogress;
             task.F_State = it.F_State;

代码/TVShoppingCallCenter_ZLJ/Controllers/knowledge/KnowledgeClassController.cs

@@ -56,8 +56,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.knowledge
                     {
                         var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
                         if (parent != null)
-                            model.F_Expand2 = parent.F_Expand2 += res + "|";
+                            model.F_Expand2 += parent.F_Expand2 + res + "|";
                     }
+                    var Expand = _repositorycategoryreposytory.Update(model);
+
                 }
                 return Success("添加成功");
             }
@@ -84,9 +86,20 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.knowledge
                 var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId)
                     .Result;
                 if (parent != null)
-                {  input.F_Expand1 = parent.F_CategoryName;
-                   input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
+                {
+                    string[] Expand = parent.F_Expand2.Split('|');
+                    if (Expand.Contains(input.F_CategoryId.ToString()))
+                    {
+                        return Error("不能选择该分类的上级分类");
+                    }
+                    else
+                    {
+                        input.F_Expand1 = parent.F_CategoryName;
+                        input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
+                    }
+                       
                 }
+               
             }
             input.F_DeleteFlag = 0;
             input.F_CreateBy = model.F_CreateBy;

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/MediaCenteInput.cs

@@ -78,7 +78,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         /// <summary>
         /// 日费用
         /// </summary>
-        public float? F_DailyExpenses
+        public float F_DailyExpenses
         {
             get; set;
         }