mirror of
https://github.com/certd/certd.git
synced 2026-04-24 04:17:25 +08:00
Merge branch 'server_sync' into v2
# Conflicts: # packages/ui/certd-server/.eslintrc.json # packages/ui/certd-server/.gitignore # packages/ui/certd-server/LICENSE # packages/ui/certd-server/README.md # packages/ui/certd-server/bootstrap.js # packages/ui/certd-server/package.json # packages/ui/certd-server/src/basic/base-service.ts # packages/ui/certd-server/src/basic/crud-controller.ts # packages/ui/certd-server/src/config/config.default.ts # packages/ui/certd-server/src/configuration.ts # packages/ui/certd-server/src/middleware/authority.ts # packages/ui/certd-server/src/middleware/global-exception.ts # packages/ui/certd-server/src/middleware/preview.ts # packages/ui/certd-server/src/middleware/report.ts # packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts # packages/ui/certd-server/src/modules/authority/controller/role-controller.ts # packages/ui/certd-server/src/modules/authority/controller/user-controller.ts # packages/ui/certd-server/src/modules/authority/service/permission-service.ts # packages/ui/certd-server/src/modules/authority/service/role-permission-service.ts # packages/ui/certd-server/src/modules/authority/service/role-service.ts # packages/ui/certd-server/src/modules/authority/service/user-role-service.ts # packages/ui/certd-server/src/modules/authority/service/user-service.ts # packages/ui/certd-server/src/modules/basic/controller/basic-controller.ts # packages/ui/certd-server/src/modules/login/controller/login-controller.ts # packages/ui/certd-server/tsconfig.json
This commit is contained in:
@@ -23,8 +23,9 @@ export abstract class BaseService<T> {
|
||||
if (!id) {
|
||||
throw new ValidateException('id不能为空');
|
||||
}
|
||||
// @ts-ignore
|
||||
const info = await this.getRepository().findOne({ where: { id } });
|
||||
const info = await this.getRepository().findOne({
|
||||
where:{ id }
|
||||
});
|
||||
if (info && infoIgnoreProperty) {
|
||||
for (const property of infoIgnoreProperty) {
|
||||
delete info[property];
|
||||
|
||||
Reference in New Issue
Block a user