Browse Source

修改时间

zs 7 months ago
parent
commit
307ee968d8
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/entityLogs/searchBehavior.entity.ts
  2. 2 2
      src/frame/BaseModel.ts

+ 1 - 1
src/entityLogs/searchBehavior.entity.ts

@@ -11,7 +11,7 @@ export class SearchBehavior extends BaseModel {
   ip: string;
   ip: string;
   @Column({ type: 'character varying', nullable: true, comment: '设备' })
   @Column({ type: 'character varying', nullable: true, comment: '设备' })
   device: string;
   device: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   time: Date;
   @Column({ type: 'character varying', comment: '检索内容' })
   @Column({ type: 'character varying', comment: '检索内容' })
   keyword: string;
   keyword: string;

+ 2 - 2
src/frame/BaseModel.ts

@@ -9,10 +9,10 @@ export class BaseModel {
   id?: number;
   id?: number;
 
 
   /**数据创建时间 */
   /**数据创建时间 */
-  @CreateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @CreateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   created_time?: Date;
   created_time?: Date;
   /**数据最后更新时间 */
   /**数据最后更新时间 */
-  @UpdateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @UpdateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   update_time?: Date;
   update_time?: Date;
 
 
   /**数据版本 */
   /**数据版本 */