|
@@ -540,7 +540,7 @@ func (d *TaskDao) ListTask2(userId int) ([]TaskData1, error) { |
|
@@ -540,7 +540,7 @@ func (d *TaskDao) ListTask2(userId int) ([]TaskData1, error) { |
540
|
task1 := d.catchTaskIdByPermission(userId)
|
540
|
task1 := d.catchTaskIdByPermission(userId)
|
541
|
sqlStr := task1 + ` select task."name" ,task.alias ,
|
541
|
sqlStr := task1 + ` select task."name" ,task.alias ,
|
542
|
task.leader ->>'id' as leader_id,
|
542
|
task.leader ->>'id' as leader_id,
|
543
|
- task.leader ->>'name' as leaer_name,
|
543
|
+ task.leader ->>'name' as leader_name,
|
544
|
task.level_name
|
544
|
task.level_name
|
545
|
from task `
|
545
|
from task `
|
546
|
result := []TaskData1{}
|
546
|
result := []TaskData1{}
|
|
@@ -556,7 +556,7 @@ func (d *TaskDao) ListTask2ForHrbp(userId int) ([]TaskData1, error) { |
|
@@ -556,7 +556,7 @@ func (d *TaskDao) ListTask2ForHrbp(userId int) ([]TaskData1, error) { |
556
|
select task_ignore.task_id,task_ignore.id from task_ignore where task_ignore.user_id =?
|
556
|
select task_ignore.task_id,task_ignore.id from task_ignore where task_ignore.user_id =?
|
557
|
)select task."name" ,task.alias ,
|
557
|
)select task."name" ,task.alias ,
|
558
|
task.leader ->>'id' as leader_id,
|
558
|
task.leader ->>'id' as leader_id,
|
559
|
- task.leader ->>'name' as leaer_name,
|
559
|
+ task.leader ->>'name' as leader_name,
|
560
|
task.level_name
|
560
|
task.level_name
|
561
|
from task
|
561
|
from task
|
562
|
left join t_task_ignore on t_task_ignore.task_id=task.id
|
562
|
left join t_task_ignore on t_task_ignore.task_id=task.id
|