Merge branch 'main' of http://git.cc-lotus.info/shuiTou/admin-service

src/controller/frame/Token.controller.ts

@@ -1,10 +1,9 @@
-import { Config, Context, Controller, Get, Inject } from "@midwayjs/core";
-import { JwtService } from "@midwayjs/jwt";
-import assert = require("assert");
-import { get } from "lodash";
-import { RoleService } from "../../service/system/role.service";
-import { RF } from "../../response/CustomerResponse";
-
+import { Config, Context, Controller, Get, Inject } from '@midwayjs/core';
+import { JwtService } from '@midwayjs/jwt';
+import assert = require('assert');
+import { get } from 'lodash';
+import { RoleService } from '../../service/system/role.service';
+import { RF } from '../../response/CustomerResponse';
 
 @Controller('/token')
 export class TokenController {
@@ -21,11 +20,13 @@ export class TokenController {
     const token = get(this.ctx, `request.header.${this.tokenKey}`);
     assert(token, '缺少token信息');
     const result: any = this.jwtService.decode(token);
-    const userMenusResult = await this.roleService.getUserMenus();
-    const menus = get(userMenusResult, 'menus');
-    const role_code = get(userMenusResult, 'role_code');
-    result.menus = menus;
-    result.role_code = role_code;
+    if (result.role !== 'User') {
+      const userMenusResult = await this.roleService.getUserMenus();
+      const menus = get(userMenusResult, 'menus');
+      const role_code = get(userMenusResult, 'role_code');
+      result.menus = menus;
+      result.role_code = role_code;
+    }
     return RF.success(result);
   }
-}
+}

src/entity/question.entity.ts

@@ -1,5 +1,12 @@
 import dayjs = require('dayjs');
-import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, VersionColumn } from 'typeorm';
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from 'typeorm';
 
 @Entity('question', { comment: '投诉与建议' })
 export class Question {
@@ -7,42 +14,66 @@ export class Question {
   @PrimaryGeneratedColumn({ type: 'integer' })
   question_id: number;
   /**数据创建时间 */
-  @CreateDateColumn({ type: 'timestamp', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
+  @CreateDateColumn({
+    type: 'timestamp',
+    transformer: {
+      from: value =>
+        value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value,
+      to: value => value,
+    },
+  })
   created_time?: Date;
   /**数据最后更新时间 */
-  @UpdateDateColumn({ type: 'timestamp', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
+  @UpdateDateColumn({
+    type: 'timestamp',
+    transformer: {
+      from: value =>
+        value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value,
+      to: value => value,
+    },
+  })
   update_time?: Date;
   /**数据版本 */
   @VersionColumn({ type: 'integer', default: 1 })
   __v?: number;
-  @Column({ comment: '用户id' })
-  user_id: string;
-  @Column({ comment: '问题类型: 1-投诉反馈; 2-意见建议; 3-咨询反馈' })
+
+  @Column({ comment: '用户id', nullable: true })
+  user_id: number;
+  @Column({ comment: '问题类型: 1-投诉反馈; 2-意见建议; 3-咨询反馈', nullable: true })
   type: string;
-  @Column({ comment: '姓名' })
+  @Column({ comment: '姓名', nullable: true })
   name: string;
-  @Column({ comment: '电话' })
+  @Column({ comment: '电话', nullable: true })
   phone: string;
-  @Column({ comment: '邮箱' })
+  @Column({ comment: '邮箱' , nullable: true})
   email: string;
-  @Column({ comment: '街/路' })
+  @Column({ comment: '街/路', nullable: true })
   street: string;
-  @Column({ comment: '小区' })
+  @Column({ comment: '小区' , nullable: true})
   community: string;
-  @Column({ comment: '楼栋' })
+  @Column({ comment: '楼栋' , nullable: true})
   building: string;
-  @Column({ comment: '单元' })
+  @Column({ comment: '单元' , nullable: true})
   unit: string;
-  @Column({ comment: '室' })
+  @Column({ comment: '室' , nullable: true})
   room: string;
-  @Column({ comment: '地址' })
+  @Column({ comment: '地址' , nullable: true})
   address: string;
-  @Column({ comment: '反馈详情' })
+  @Column({ comment: '反馈详情' , nullable: true})
   description: string;
-  @Column({ comment: '处理反馈' })
+  @Column({ comment: '处理反馈' , nullable: true})
   deal_desc: string;
-  @Column({ comment: '处理状态: 0-未处理;1-已处理', default: '0' })
-  deal_status: string
-  @Column({ type: 'timestamp', nullable: true, transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value }, comment: '处理时间' })
+  @Column({ comment: '处理状态: 0-未处理;1-已处理', default: '0' , nullable: true})
+  deal_status: string;
+  @Column({
+    type: 'timestamp',
+    nullable: true,
+    transformer: {
+      from: value =>
+        value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value,
+      to: value => value,
+    },
+    comment: '处理时间',
+  })
   deal_time: Date;
 }

src/entity/result.entity.ts

@@ -4,7 +4,7 @@ import { BaseModel } from '../frame/BaseModel';
 @Entity('result', { comment: '满意度调查结果' })
 export class Result extends BaseModel {
   @Column({ comment: '用户id', nullable: true })
-  user_id: string;
+  user_id: number;
   @Column({ comment: '客户名称', nullable: true })
   name: string;
   @Column({ type: 'json', nullable: true, comment: '答案' })

src/frame/Options.ts

@@ -1,5 +1,5 @@
-import { Rule, RuleType } from "@midwayjs/validate";
-import { get } from "lodash";
+import { Rule, RuleType } from '@midwayjs/validate';
+import { get } from 'lodash';
 
 /**分页处理参数 */
 export interface PageOptions {
@@ -23,14 +23,12 @@ export enum LoginType {
 export class LoginVO {
   constructor(data: object) {
     this.id = get(data, 'id');
-    this.nick_name = get(data, 'nick_name');
-    this.openid = get(data, 'openid');
+    this.nick_name = get(data, 'nick_name', get(data, 'username'));
     this.role = get(data, 'role');
     this.is_super = get(data, 'is_super');
   }
   id: number;
   nick_name: string;
-  openid: string;
   role: string;
   is_super: string;
 }
@@ -42,4 +40,4 @@ export class UPwdDTO {
   // @ApiProperty({ description: '密码' })
   @Rule(RuleType['string']().required())
   password: string = undefined;
-}
+}