Merge pull request 'fix: hotfix errorMyTeam' (!3229 ) from hotfix-filterOrder into master

Reviewed-on: #3229 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
fix: hotfix errorMyTeam
2024-11-21 09:23:14 +00:00 · 2024-11-21 10:18:17 +01:00
1 changed files with 2 additions and 2 deletions
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@ -79,12 +79,12 @@ module.exports = Self => {
        const models = Self.app.models;
        const conn = Self.dataSource.connector;
        const myOptions = {};
+        const userId = ctx.req.accessToken.userId;

        if (typeof options == 'object')
            Object.assign(myOptions, options);

        const args = ctx.args;
-
        // Apply filter by team
        const teamMembersId = [];
        if (args.myTeam != null) {
@ -102,7 +102,7 @@ module.exports = Self => {
        }

        if (args && args.myTeam)
-            args.teamIds = teamIds;
+            args.teamIds = teamMembersId;

        const where = buildFilter(args, (param, value) => {
            switch (param) {
Author	SHA1	Message	Date
Carlos Satorres	7b177fa09f	Merge pull request 'fix: hotfix errorMyTeam' (!3229 ) from hotfix-filterOrder into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #3229 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 09:23:14 +00:00
Carlos Satorres	2978af8341	fix: hotfix errorMyTeam gitea/salix/pipeline/pr-master This commit looks good Details	2024-11-21 10:18:17 +01:00