q-koa 11.5.6 → 11.6.2

package/core/app.js

@@ -947,6 +947,7 @@ class APP {
             is_split = false,
             autoInclude = true,
             omit = [],
+            includeWhere = {},
             ...other
           } = ctx.request.body
           if (['findOne', 'findAll', 'findAndCountAll'].includes(fn)) {
@@ -1126,11 +1127,25 @@ class APP {
             // 拆分
             if (is_split) {
               if (fn === 'findAndCountAll') {
-                const requiredInclude = myInclude.filter(
-                  (item) =>
-                    (item.where && !item.hasOwnProperty('required')) ||
-                    (item.hasOwnProperty('required') && item.required)
-                )
+                const requiredInclude = myInclude
+                  .filter(
+                    (item) =>
+                      (item.where && !item.hasOwnProperty('required')) ||
+                      (item.hasOwnProperty('required') && item.required)
+                  )
+                  .map((item) => {
+                    return {
+                      ...item,
+                      where: {
+                        ...item.where,
+                        ...(includeWhere[item.model.getName()]
+                          ? {
+                              ...includeWhere[item.model.getName()],
+                            }
+                          : {}),
+                      },
+                    }
+                  })
                 const { count, rows } = await app[appName].model[controller][
                   fn
                 ]({

package/core/file/plugins/app/controller.js

@@ -52,6 +52,6 @@ exports.login = async (ctx) => {
     token,
     user: app.appConfig.loginData
       ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
-      : result,
+      : result.toJSON(),
   })
 }

package/core/file/plugins/user/controller.js

@@ -47,7 +47,7 @@ exports.login = async (ctx) => {
       token,
       user: app.appConfig.loginData
         ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
-        : result,
+        : result.toJSON(),
     })
   }
   if (
@@ -212,7 +212,7 @@ exports.login = async (ctx) => {
     token,
     user: app.appConfig.loginData
       ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
-      : result,
+      : result.toJSON(),
   })
 }
 
@@ -432,7 +432,7 @@ exports.checkLogin = async (ctx) => {
       token,
       user: app.appConfig.loginData
         ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
-        : result,
+        : result.toJSON(),
     })
   }
 

package/core/file/plugins/weixin/controller.js

@@ -498,7 +498,7 @@ exports.mp_login = async (ctx) => {
     token,
     user: app.appConfig.loginData
       ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
-      : result,
+      : result.toJSON(),
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "11.5.6",
+  "version": "11.6.2",
   "description": "",
   "main": "index.js",
   "scripts": {