完善日志

src/app/modules/base/config.ts

@@ -11,6 +11,6 @@ export default (app: Application) => {
         // 模块描述
         describe: '基础的权限管理功能，包括登录，权限校验',
         // 中间件
-        middlewares: ['baseLogMiddleware', 'baseAuthorityMiddleware'],
+        middlewares: ['baseAuthorityMiddleware', 'baseLogMiddleware'],
     } as ModuleConfig;
 };

src/app/modules/base/controller/admin/sys/department.ts

@@ -23,7 +23,7 @@ export class BaseDepartmentController extends BaseController {
     @Post('/order')
     async order(@Body(ALL) params: Object) {
         await this.baseDepartmentService.order(params);
-        this.ok();
+        return this.ok();
     }
 
 }

src/app/modules/base/controller/admin/sys/log.ts

@@ -32,7 +32,7 @@ export class BaseSysLogController extends BaseController {
     @Post('/clear')
     public async clear() {
         await this.adminSysLogService.clear(true);
-        this.ok();
+        return this.ok();
     }
 
 }

src/app/modules/base/service/sys/department.ts

@@ -21,7 +21,7 @@ export class BaseSysDepartmentService extends BaseService {
     baseSysRoleDepartmentEntity: Repository<BaseSysRoleDepartmentEntity>;
 
     @Inject()
-    baseSysPremsService: BaseSysPermsService;
+    baseSysPermsService: BaseSysPermsService;
 
     @Inject()
     ctx: Context;
@@ -30,7 +30,7 @@ export class BaseSysDepartmentService extends BaseService {
      * 获得部门菜单
      */
     async list () {
-        const permsDepartmentArr = await this.baseSysPremsService.departmentIds(this.ctx.admin.userId); // 部门权限
+        const permsDepartmentArr = await this.baseSysPermsService.departmentIds(this.ctx.admin.userId); // 部门权限
         const departments = await this.nativeQuery(`
         SELECT
             *
@@ -38,7 +38,7 @@ export class BaseSysDepartmentService extends BaseService {
         base_sys_department a
         WHERE
         1 = 1
-        ${ this.setSql(this.ctx.decoded.userId !== '1', 'and a.id in (?)', [ !_.isEmpty(permsDepartmentArr) ? permsDepartmentArr : [ null ] ]) }
+        ${ this.setSql(this.ctx.admin.userId !== '1', 'and a.id in (?)', [ !_.isEmpty(permsDepartmentArr) ? permsDepartmentArr : [ null ] ]) }
         ORDER BY
         a.orderNum ASC`);
         if (!_.isEmpty(departments)) {