123

app/service/login.js

@@ -80,8 +80,9 @@ class LoginService extends CrudService {
     const token = await this.createJwt(user);
     await this.app.redis.set(key, token, 'EX', 60 * 60 * 24);
     let logFlag = false;
+    let dockList = []
     // "4568"如果是456的需要去dock里面查有没有这个人（是否在apply），2，8必存
-    if(_user.role === '4' || _user.role === '5' || _user.role === '6'){
+    if(_user.role === '4' || _user.role === '5' || _user.role === '6' || _user.role === '8'){
       const applydata = { user_id: user.id};
       const url = 'http://127.0.0.1:9008/api/live/getapply';
       const applyflag = await this.ctx.curl(url, {
@@ -93,22 +94,41 @@ class LoginService extends CrudService {
         data: JSON.stringify(applydata),
       });
       // 如果有值true，说明登录者是申请用户，反之，false
-      logFlag = applyflag.data.res
-    }else if(_user.role === '2' || _user.role === '8'){
+      if(applyflag.data.res.length  > 0){
+        logFlag = true
+        dockList = applyflag.data.res
+      }
+    }else if(_user.role === '2'){
       logFlag = true;
     }
-  if(logFlag){
-    const operationlogdata = { login_id: user.id, login_name: user.name, login_role: user.role, type: '0', operation_edit: '登录' };
-    const url = 'http://127.0.0.1:9004/api/market/operationlog/';
-    const operationlog = await this.ctx.curl(url, {
-      method: 'post',
-      headers: {
-        'content-type': 'application/json',
-      },
-      dataType: 'json',
-      data: JSON.stringify(operationlogdata),
-    });
-  }
+    if(logFlag){
+      if(dockList.length > 0){
+        for(let dock of dockList){
+          const operationlogdata = { dockid: dock.id, login_name: user.name, login_role: user.role, type: '0', operation_edit: '登录' };
+          const url = 'http://127.0.0.1:9004/api/market/operationlog/';
+          const operationlog = await this.ctx.curl(url, {
+            method: 'post',
+            headers: {
+              'content-type': 'application/json',
+            },
+            dataType: 'json',
+            data: JSON.stringify(operationlogdata),
+          });
+        }
+      }else{
+        const operationlogdata = { login_id: user.id, login_name: user.name, login_role: user.role, type: '0', operation_edit: '登录' };
+        const url = 'http://127.0.0.1:9004/api/market/operationlog/';
+        const operationlog = await this.ctx.curl(url, {
+          method: 'post',
+          headers: {
+            'content-type': 'application/json',
+          },
+          dataType: 'json',
+          data: JSON.stringify(operationlogdata),
+        });
+      }
+      
+    }
     return { key };
   }