duhongyu 5 years ago
parent
commit
e6fff66c19

+ 2 - 2
代码/System.Model/Sys/T_Sys_MediaCente.cs

20
         private string _f_phone;
20
         private string _f_phone;
21
         private string _f_commodity;
21
         private string _f_commodity;
22
         private DateTime? _f_launchtime;
22
         private DateTime? _f_launchtime;
23
-        private float ? _f_dailyexpenses;
23
+        private float  _f_dailyexpenses;
24
         private string _f_playplan;
24
         private string _f_playplan;
25
         private int? _f_isremind;
25
         private int? _f_isremind;
26
         private string _f_deptid;
26
         private string _f_deptid;
93
         /// <summary>
93
         /// <summary>
94
         /// 日费用
94
         /// 日费用
95
         /// </summary>
95
         /// </summary>
96
-        public float? F_DailyExpenses
96
+        public float F_DailyExpenses
97
         {
97
         {
98
             set { _f_dailyexpenses = value; }
98
             set { _f_dailyexpenses = value; }
99
             get { return _f_dailyexpenses; }
99
             get { return _f_dailyexpenses; }

+ 1 - 1
代码/System.Model/Sys/T_Sys_TaskManagement.cs

55
         /// <summary>
55
         /// <summary>
56
         /// 目标金额
56
         /// 目标金额
57
         /// </summary>
57
         /// </summary>
58
-        public float? F_Money
58
+        public float F_Money
59
         { get; set; }
59
         { get; set; }
60
         /// <summary>
60
         /// <summary>
61
         /// 当前金额
61
         /// 当前金额

+ 12 - 0
代码/TVShoppingCallCenter_ZLJ/Controllers/IndexCategory/IndexCategoryController.cs

87
                         if (parent != null)
87
                         if (parent != null)
88
                             model.F_Expand2 = parent.F_Expand2 += res + "|";
88
                             model.F_Expand2 = parent.F_Expand2 += res + "|";
89
                     }
89
                     }
90
+                    var Expand = _qc_indexcategoryreposytory.Update(model);
90
                 }
91
                 }
91
               
92
               
92
              
93
              
113
             input.F_CreateBy = model.F_CreateBy;
114
             input.F_CreateBy = model.F_CreateBy;
114
             input.F_CreateOn = model.F_CreateOn;
115
             input.F_CreateOn = model.F_CreateOn;
115
             input.F_Expand2 = "|" + input.F_CategoryId + "|";
116
             input.F_Expand2 = "|" + input.F_CategoryId + "|";
117
+          
118
+
116
                 if (input.F_ParentId > 0)
119
                 if (input.F_ParentId > 0)
117
                 {
120
                 {
118
                     var parent = _qc_indexcategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
121
                     var parent = _qc_indexcategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
119
                     if (parent != null)
122
                     if (parent != null)
123
+                  {
124
+                    string[] Expand = parent.F_Expand2.Split('|');
125
+                    if (Expand.Contains (input.F_CategoryId.ToString () ))
126
+                    {
127
+                        return Error("不能选择该分类的上级分类");
128
+                    }
129
+                    else 
120
                     input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
130
                     input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
131
+                   }
132
+                    
121
                 }
133
                 }
122
            
134
            
123
             var b = await _qc_indexcategoryreposytory.Update(input);
135
             var b = await _qc_indexcategoryreposytory.Update(input);

+ 1 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

620
             }
620
             }
621
             task.F_DeptName = deptmsg;// 部门名称
621
             task.F_DeptName = deptmsg;// 部门名称
622
             task.F_Tasker = it.F_Tasker;
622
             task.F_Tasker = it.F_Tasker;
623
-
624
-            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  : "";
625
             task.F_Money = it.F_Money;
623
             task.F_Money = it.F_Money;
624
+            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  : "";
626
             task.F_Currentamount = it.F_Currentamount;
625
             task.F_Currentamount = it.F_Currentamount;
627
             task.F_Taskprogress = it.F_Taskprogress;
626
             task.F_Taskprogress = it.F_Taskprogress;
628
             task.F_State = it.F_State;
627
             task.F_State = it.F_State;

+ 16 - 3
代码/TVShoppingCallCenter_ZLJ/Controllers/knowledge/KnowledgeClassController.cs

56
                     {
56
                     {
57
                         var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
57
                         var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId).Result;
58
                         if (parent != null)
58
                         if (parent != null)
59
-                            model.F_Expand2 = parent.F_Expand2 += res + "|";
59
+                            model.F_Expand2 += parent.F_Expand2 + res + "|";
60
                     }
60
                     }
61
+                    var Expand = _repositorycategoryreposytory.Update(model);
62
+
61
                 }
63
                 }
62
                 return Success("添加成功");
64
                 return Success("添加成功");
63
             }
65
             }
84
                 var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId)
86
                 var parent = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == input.F_ParentId)
85
                     .Result;
87
                     .Result;
86
                 if (parent != null)
88
                 if (parent != null)
87
-                {  input.F_Expand1 = parent.F_CategoryName;
88
-                   input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
89
+                {
90
+                    string[] Expand = parent.F_Expand2.Split('|');
91
+                    if (Expand.Contains(input.F_CategoryId.ToString()))
92
+                    {
93
+                        return Error("不能选择该分类的上级分类");
94
+                    }
95
+                    else
96
+                    {
97
+                        input.F_Expand1 = parent.F_CategoryName;
98
+                        input.F_Expand2 = parent.F_Expand2 += input.F_CategoryId + "|";
99
+                    }
100
+                       
89
                 }
101
                 }
102
+               
90
             }
103
             }
91
             input.F_DeleteFlag = 0;
104
             input.F_DeleteFlag = 0;
92
             input.F_CreateBy = model.F_CreateBy;
105
             input.F_CreateBy = model.F_CreateBy;

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/MediaCenteInput.cs

78
         /// <summary>
78
         /// <summary>
79
         /// 日费用
79
         /// 日费用
80
         /// </summary>
80
         /// </summary>
81
-        public float? F_DailyExpenses
81
+        public float F_DailyExpenses
82
         {
82
         {
83
             get; set;
83
             get; set;
84
         }
84
         }