npm - @provis/provis-common-be-module - Versions diffs - 2.2.11 → 2.2.13 - Mend

@provis/provis-common-be-module 2.2.11 → 2.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/class/main.repository.js +8 -1
package/package.json +1 -1

package/dist/class/main.repository.js CHANGED Viewed

@@ -190,6 +190,7 @@ class MainRepository extends typeorm_1.Repository {
             });
         }
         if (relations && relations.length > 0) {
+            let isFirstJoin = true;
             relations.forEach((relation) => {
                 var _a, _b;
                 if (relation) {
@@ -203,7 +204,13 @@ class MainRepository extends typeorm_1.Repository {
                     (_a = relation.searchs) === null || _a === void 0 ? void 0 : _a.forEach((valueSearch) => {
                         if (valueSearch) {
                             if (index == 0) {
-                                query = query.orWhere(`${relation.model}.${valueSearch.query}`, { [valueSearch.key]: valueSearch.value });
+                                if (isFirstJoin) {
+                                    query = query.andWhere(`${relation.model}.${valueSearch.query}`, { [valueSearch.key]: valueSearch.value });
+                                    isFirstJoin = false;
+                                }
+                                else {
+                                    query = query.andWhere(`${relation.model}.${valueSearch.query}`, { [valueSearch.key]: valueSearch.value });
+                                }
                                 index++;
                             }
                             else {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@provis/provis-common-be-module",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "description": "This common module for Provis internal backend use lib",
   "main": "dist/index.js",
   "scripts": {