walle 2.0.1 - 上线单增加「我的」上线任务过滤

walle/api/task.py

@@ -40,9 +40,7 @@ class TaskAPI(SecurityResource):
         kw = request.values.get('kw', '')
 
         user_id = request.values.get('user_id', '')
-        # TODO 将来更多的权限模式下，高级权限下可以选择多个用户user_id，用英文逗号分割
-        if int(user_id) != current_user.id and permission.role_upper_master():
-            user_id = None
+        user_id = user_id.split(',') if user_id else []
 
         task_list, count = TaskModel().list(page=page, size=size, kw=kw, space_id=self.space_id, user_id=user_id)
         return self.list_json(list=task_list, count=count, enable_create=permission.role_upper_reporter() and current_user.role != SUPER)

walle/model/task.py

@@ -100,7 +100,7 @@ class TaskModel(SurrogatePK, Model):
             query = query.filter(ProjectModel.space_id == space_id)
 
         if user_id:
-            query = query.filter(TaskModel.user_id == user_id)
+            query = query.filter(TaskModel.user_id.in_(user_id))
 
         query = query.add_columns(ProjectModel.name, EnvironmentModel.name, ProjectModel.keep_version_num)
         count = query.count()