Browse Source

update: 任务修改为物理删除

zoie 2 years ago
parent
commit
fe9c8d6243
2 changed files with 5 additions and 3 deletions
  1. 1 1
      controllers/Task.go
  2. 4 2
      models/Task/Task.go

+ 1 - 1
controllers/Task.go

@@ -297,7 +297,7 @@ func (c *TaskController) Del() {
 
 	T_task_id := c.GetString("T_task_id")
 	if r, is := Task.Read_Task(T_task_id); is {
-		if !Task.Delete_Task_(r) {
+		if !Task.Delete_Task(r) {
 			c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 			c.ServeJSON()
 			return

+ 4 - 2
models/Task/Task.go

@@ -215,7 +215,8 @@ func Read_Task(T_task_id string) (r Task, is bool) {
 
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(Task))
-	err := qs.Filter("T_task_id", T_task_id).Filter("T_State", 1).One(&r)
+	//err := qs.Filter("T_task_id", T_task_id).Filter("T_State", 1).One(&r)
+	err := qs.Filter("T_task_id", T_task_id).One(&r)
 	if err != nil {
 		return r, false
 	}
@@ -342,7 +343,8 @@ func Read_UserTask_List(T_uuid string, T_name string, userMap, adminMap map[stri
 		offset = int64((page - 1) * page_z)
 	}
 	cond := orm.NewCondition()
-	cond1 := cond.And("T_name__icontains", T_name).And("T_State", 1)
+	//cond1 := cond.And("T_name__icontains", T_name).And("T_State", 1)
+	cond1 := cond.And("T_name__icontains", T_name)
 	if len(T_uuid) > 0 {
 		cond1 = cond1.And("T_uuid", T_uuid)
 	}