更新

@@ -684,6 +684,7 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
 		Limit:      limit,
 		Limit:      limit,
 		Offset:     offset,
 		Offset:     offset,
 		UserId:     param.UserId,
 		UserId:     param.UserId,
+		CompanyId:  param.CompanyId,
 		TaskName:   param.TaskName,
 		TaskName:   param.TaskName,
 		LevelName:  param.LevelName,
 		LevelName:  param.LevelName,
 		OnlyMy:     param.OnlyMy,
 		OnlyMy:     param.OnlyMy,
@@ -783,6 +784,7 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s
 		Limit:      limit,
 		Limit:      limit,
 		Offset:     offset,
 		Offset:     offset,
 		UserId:     param.UserId,
 		UserId:     param.UserId,
+		CompanyId:  param.CompanyId,
 		TaskName:   param.TaskName,
 		TaskName:   param.TaskName,
 		LevelName:  param.LevelName,
 		LevelName:  param.LevelName,
 		OnlyMy:     param.OnlyMy,
 		OnlyMy:     param.OnlyMy,

@@ -62,6 +62,7 @@ func (d *TaskDao) catchTaskIdByPermission(userId int) string {
 type ListTaskCondition struct {
 type ListTaskCondition struct {
 	Limit      int    //分页
 	Limit      int    //分页
 	Offset     int    //分页
 	Offset     int    //分页
+	CompanyId  int    //公司id
 	UserId     int    //谁要查看任务数据
 	UserId     int    //谁要查看任务数据
 	TaskName   string //任务名称
 	TaskName   string //任务名称
 	LevelName  string //优先级
 	LevelName  string //优先级
@@ -125,7 +126,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
 		from  task 
 		from  task 
 		join  t_task_1 on task.id=t_task_1.id
 		join  t_task_1 on task.id=t_task_1.id
 		join task_stage on task.id =task_stage.task_id 
 		join task_stage on task.id =task_stage.task_id 
-		where 1=1 
+		where 1=1 and task.company_id=?
 		order by diff_time,task."level",task.created_at  
 		order by diff_time,task."level",task.created_at  
 	),
 	),
 	-- 按任务数据分页获取
 	-- 按任务数据分页获取
@@ -156,7 +157,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
 	where t_task_tage_1.task_id in(
 	where t_task_tage_1.task_id in(
 	 select t_task_page.task_id from t_task_page
 	 select t_task_page.task_id from t_task_page
 	)`
 	)`
-	condition := []interface{}{}
+	condition := []interface{}{param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
@@ -186,8 +187,8 @@ func (d *TaskDao) CountTaskStageNotHrbp(param ListTaskCondition) (int, error) {
 	task1 := d.catchTaskIdByPermission(param.UserId)
 	task1 := d.catchTaskIdByPermission(param.UserId)
 	withSql := task1 + `select count(*) from task
 	withSql := task1 + `select count(*) from task
 	join t_task_1 on task.id =t_task_1.id
 	join t_task_1 on task.id =t_task_1.id
-	where 1=1 `
-	condition := []interface{}{}
+	where 1=1 and task.company_id=?`
+	condition := []interface{}{param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
@@ -247,7 +248,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
 		end) as diff_time
 		end) as diff_time
 		from  task 
 		from  task 
 		join task_stage on task.id =task_stage.task_id 
 		join task_stage on task.id =task_stage.task_id 
-		where 1=1 
+		where 1=1 and task.company_id=?
 		order by diff_time,task."level",task.created_at  
 		order by diff_time,task."level",task.created_at  
 	),
 	),
 	-- 按任务数据分页获取
 	-- 按任务数据分页获取
@@ -280,7 +281,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
 	where t_task_tage_1.task_id in(
 	where t_task_tage_1.task_id in(
 	 select t_task_page.task_id from t_task_page
 	 select t_task_page.task_id from t_task_page
 	)`
 	)`
-	condition := []interface{}{param.UserId}
+	condition := []interface{}{param.UserId, param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
@@ -313,8 +314,8 @@ func (d *TaskDao) CountTaskStageByHrbp(param ListTaskCondition) (int, error) {
 		select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
 		select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
 	)select count(*) from task
 	)select count(*) from task
 	left join  t_task_ignore on t_task_ignore.task_id=task.id
 	left join  t_task_ignore on t_task_ignore.task_id=task.id
-	where 1=1 `
-	condition := []interface{}{param.UserId}
+	where 1=1 and task.company_id=?`
+	condition := []interface{}{param.UserId, param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
@@ -345,13 +346,13 @@ func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, er
 	from task_stage 
 	from task_stage 
 	join task on task_stage.task_id =task.id 
 	join task on task_stage.task_id =task.id 
 	join t_task_1 on task.id =t_task_1.id
 	join t_task_1 on task.id =t_task_1.id
-	where 1=1 
+	where 1=1 and task.company_id=?
 	and(
 	and(
 		(task_stage.plan_completed_at <task_stage.real_completed_at)
 		(task_stage.plan_completed_at <task_stage.real_completed_at)
 		or
 		or
 		(task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now()))
 		(task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now()))
 	) `
 	) `
-	condition := []interface{}{}
+	condition := []interface{}{param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
@@ -384,13 +385,13 @@ func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, err
 	from task_stage 
 	from task_stage 
 	join task on task_stage.task_id =task.id 
 	join task on task_stage.task_id =task.id 
 	left join t_task_ignore on t_task_ignore.task_id=task.id
 	left join t_task_ignore on t_task_ignore.task_id=task.id
-	where 1=1
+	where 1=1 and task.company_id=?
 	and(
 	and(
 		(task_stage.plan_completed_at <task_stage.real_completed_at)
 		(task_stage.plan_completed_at <task_stage.real_completed_at)
 		or
 		or
 		(task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now()))
 		(task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now()))
 	) `
 	) `
-	condition := []interface{}{param.UserId}
+	condition := []interface{}{param.UserId, param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)