@kne/fastify-account 1.0.0-alpha.3 → 1.0.0-alpha.4

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 (3) hide show
  1. package/libs/controllers/tenant.js +1 -1
  2. package/libs/services/tenant-org.js +2 -2
  3. package/package.json +1 -1
package/libs/controllers/tenant.js CHANGED
@@ -27,7 +27,7 @@ module.exports = fp(async (fastify, options) => {
27
27
  onRequest: [authenticate.user, authenticate.tenant]
28
28
  },
29
29
  async request => {
30
- const { tenantId } = request.tenantInfo;
30
+ const { id: tenantId } = request.tenantInfo.tenant;
31
31
  return await services.tenantOrg.getTenantOrgList({ tenantId });
32
32
  }
33
33
  );
package/libs/services/tenant-org.js CHANGED
@@ -67,11 +67,11 @@ module.exports = fp(async (fastify, options) => {
67
67
  };
68
68
 
69
69
  const getTenantOrgList = async ({ tenantId }) => {
70
- const { count, rows } = await models.tenantOrg.findAndCountAll({
70
+ const data = await models.tenantOrg.findAll({
71
71
  where: { tenantId }
72
72
  });
73
73
 
74
- return { pageData: rows, totalCount: count };
74
+ return data.map(item => item.get({ plain: true }));
75
75
  };
76
76
 
77
77
  services.tenantOrg = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kne/fastify-account",
3
- "version": "1.0.0-alpha.3",
3
+ "version": "1.0.0-alpha.4",
4
4
  "description": "fastify的用户管理账号等实现",
5
5
  "main": "index.js",
6
6
  "scripts": {