禅道bug

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

@@ -263,6 +263,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
                 model.F_Remark,
                 model.F_Title,
                 model.F_Score,
+                model .F_Sort ,
                 model.F_IndexId,
             };
            

代码/TVShoppingCallCenter_ZLJ/Controllers/InternalMessages/InternalMessagesController.cs

@@ -109,7 +109,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
             {
                 conModels.Add(new ConditionalModel() { FieldName = "SMS_IsRead", ConditionalType = ConditionalType.Equal , FieldValue = isread.ToString() });
             }
-            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
+            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user&&x.F_DeleteFlag ==0).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user && x.F_DeleteFlag == 0).Result.F_DeptId : 0;
             if (dept>0)
             {
                 conModels.Add(new ConditionalCollections()

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/ManagementCenterController.cs

@@ -159,7 +159,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             if (string.IsNullOrEmpty(time))
                 time = DateTime.Now.ToString("yyyy-MM");
             string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
-            int userid= _sys_useraccountRepository.GetSingle(x => x.F_UserCode  == user).Result!=null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_UserId:0;
+            int userid= _sys_useraccountRepository.GetSingle(x => x.F_UserCode  == user&&x.F_DeleteFlag ==0).Result!=null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user && x.F_DeleteFlag == 0).Result.F_UserId:0;
             if (userid > 0)
             {
                 List<IConditionalModel> conModels = new List<IConditionalModel>();

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/TodoManagementController.cs

@@ -241,7 +241,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
 
             #endregion
             int recordCount = 0;
-            var list = await _sys_todomanagementrepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
+            var list = await _sys_todomanagementrepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, "  F_CreateTime  desc");
             var obj = new
             {
                 state = "success",

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

@@ -69,6 +69,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
             var res = await _sys_taskmanagement_Repository.Add(input);
             if (res > 0)
             {
+                if (input .F_Parentid == res)
+                {
+                    input.F_Parentid = 0;
+                   var  v=  _sys_taskmanagement_Repository.Update(input);
+                }
                 try
                 {
                     DateTime time = DateTime.Parse(input.F_Remindertime.ToString());
@@ -102,6 +107,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
         {
             if (input.F_ID <= 0)
                 return Error("参数错误");
+            if (input.F_Parentid == input.F_ID)
+                return Error("父级ID不能和子ID相同");
             if (string.IsNullOrEmpty(input.F_Name))
                 return Error("请输入任务名称");
             if (string.IsNullOrEmpty(input.F_Content))
@@ -262,7 +269,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getlist")]
-        public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
+        public async Task<IActionResult> GetListMark(string keyword, string name, string starttime, string endtime, string tasker,
       string  deptid , int parentid=0,int type = -1, int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -283,13 +290,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
                     return Error("请输入正确的任务人");
                 }
             }
-            if (string .IsNullOrEmpty (tasker)&& string.IsNullOrEmpty(parentname))
+            if (string .IsNullOrEmpty (tasker)&& string.IsNullOrEmpty(keyword))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal, FieldValue = parentid.ToString() });
             }
            // string user = "8000";
                string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
-            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
+            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user&&x.F_DeleteFlag ==0).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user&& x.F_DeleteFlag == 0).Result.F_DeptId : 0;
             if (!string.IsNullOrEmpty(deptid))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
@@ -300,23 +307,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
                 new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
                 deptid = dept.ToString();
             }
-            if (!string.IsNullOrEmpty(parentname))
-            {
-                List<IConditionalModel> conModel = new List<IConditionalModel>();
-                conModel.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal, FieldValue = user });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = deptid.ToString() });
-                conModel.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
-                conModel.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = parentname });
-                var model = _sys_taskmanagement_Repository.GetListALL(conModel, "F_CreateTime desc ").Result.FirstOrDefault();
-                if (model != null  )
-                {
-                    conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal, FieldValue = model.F_ID .ToString ()    });
-                }
-                else
-                {
-                    return Error("请输入正确的父级任务名称");
-                }
-            }
+          
             
             if (type > -1)
             {
@@ -511,9 +502,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
                         errmsg = errmsg + "\r\n第" + index + "行导入失败！请检查任务部门";
                         continue;
                     }
-                    if (_sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()).Result != null)
+                    if (_sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()&&x.F_DeleteFlag ==0).Result != null)
                     {
-                        model.F_Tasker = _sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()).Result.F_UserId   ;
+                        model.F_Tasker = _sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString() && x.F_DeleteFlag == 0).Result.F_UserId   ;
                       
                     }
                     else