zs 1 年之前
父節點
當前提交
0a44347a50
共有 1 個文件被更改,包括 5 次插入8 次删除
  1. 5 8
      src/service/user/personal.service.ts

+ 5 - 8
src/service/user/personal.service.ts

@@ -14,9 +14,6 @@ import {
   LoginDTO,
   QDTO_personal,
 } from '../../interface/user/personal.interface';
-import isEqual = require('lodash/isEqual');
-import get = require('lodash/get');
-import head = require('lodash/head');
 import _ = require('lodash');
 import { UtilService } from '../../service/util/util';
 const Excel = require('exceljs');
@@ -50,12 +47,12 @@ export class PersonalService extends BaseService<modelType> {
         '未找到个人用户信息',
         FrameworkErrorEnum.NOT_FOUND_DATA
       );
-    if (get(user, 'status') !== '1')
+    if (_.get(user, 'status') !== '1')
       throw new ServiceError(
         '当前个人用户没有通过审核,拒绝登录',
         FrameworkErrorEnum.SERVICE_FAULT
       );
-    if (!isEqual(user.password.secret, password))
+    if (!_.isEqual(user.password.secret, password))
       throw new ServiceError('密码错误', FrameworkErrorEnum.SERVICE_FAULT);
     return user;
   }
@@ -80,7 +77,7 @@ export class PersonalService extends BaseService<modelType> {
           '未找到该管理员',
           FrameworkErrorEnum.NOT_FOUND_DATA
         );
-      const aid = get(head(a), '_id');
+      const aid = _.get(_.head(a), '_id');
       const orgList = await orgFind({ pid: aid });
       const busList = await busFind({ pid: orgList.map(i => i._id) });
       const codes: any = [
@@ -98,7 +95,7 @@ export class PersonalService extends BaseService<modelType> {
           '未找到该机构',
           FrameworkErrorEnum.NOT_FOUND_DATA
         );
-      const oid = get(head(o), '_id');
+      const oid = _.get(_.head(o), '_id');
       const busList = await busFind({ pid: oid });
       const codes: any = [...busList.map(i => i.code), code];
       condition.code = codes;
@@ -124,7 +121,7 @@ export class PersonalService extends BaseService<modelType> {
     await workbook.xlsx.load(file);
     const sheet = workbook.getWorksheet(1);
     // 根据excel,将列序号加入meta中
-    const meta: any = get(this.model.schema, 'tree');
+    const meta: any = _.get(this.model.schema, 'tree');
     const list: any = [];
     const head = _.get(sheet.getRow(1), 'values', []);
     for (let i = 0; i < head.length; i++) {