reloaded преди 5 години
родител
ревизия
0bf09d82c5
променени са 5 файла, в които са добавени 19 реда и са изтрити 23 реда
  1. 1 5
      app/service/expert.js
  2. 1 1
      app/service/staff.js
  3. 1 1
      app/service/user.js
  4. 8 8
      config/config.default.js
  5. 8 8
      config/config.local.js

+ 1 - 5
app/service/expert.js

@@ -29,11 +29,7 @@ class ExpertService extends CrudService {
     }
     if (phone) {
       const _user = await this.umodel.find({ phone });
-      console.log(phone);
-
-      console.log(_user);
-
-      if (_user.length === 0 || (_user.lenght === 1 && _user[0].id === user.id)) {
+      if (_.isEqual(_user.length, 0) || (_.isEqual(_user.length, 1) && _.isEqual(_user[0].id, user.id))) {
         user.phone = phone;
         expert.phone = phone;
         await user.save();

+ 1 - 1
app/service/staff.js

@@ -28,7 +28,7 @@ class StaffService extends CrudService {
     }
     if (phone) {
       const _user = await this.umodel.find({ phone });
-      if (_user.length === 0 || (_user.lenght === 1 && _user[0].id === user.id)) {
+      if (_.isEqual(_user.length, 0) || (_.isEqual(_user.length, 1) && _.isEqual(_user[0].id, user.id))) {
         user.phone = phone;
         staff.phone = phone;
         await user.save();

+ 1 - 1
app/service/user.js

@@ -67,7 +67,7 @@ class UserService extends CrudService {
     }
     if (phone) {
       const _user = await this.model.find({ phone });
-      if (_user.length === 0 || (_user.lenght === 1 && _user[0].id === user.id)) {
+      if (_.isEqual(_user.length, 0) || (_.isEqual(_user.length, 1) && _.isEqual(_user[0].id, user.id))) {
         if (user.type === '0' || user.type === '1') {
           const staff = await this.smodel.findById(user.userid);
           staff.phone = phone;

+ 8 - 8
config/config.default.js

@@ -34,14 +34,14 @@ module.exports = appInfo => {
 
   // mongoose config
   config.mongoose = {
-    url: 'mongodb://127.0.0.1:27017/count',
-    options: {
-      user: 'admin',
-      pass: 'admin',
-      authSource: 'admin',
-      useNewUrlParser: true,
-      useCreateIndex: true,
-    },
+    url: 'mongodb://localhost:27017/count',
+    // options: {
+    //   user: 'admin',
+    //   pass: 'admin',
+    //   authSource: 'admin',
+    //   useNewUrlParser: true,
+    //   useCreateIndex: true,
+    // },
   };
 
   // // JWT config

+ 8 - 8
config/config.local.js

@@ -10,14 +10,14 @@ module.exports = () => {
 
   config.mongoose = {
     url: 'mongodb://localhost:27017/count',
-    options: {
-      user: 'demo',
-      pass: 'demo',
-      authSource: 'admin',
-      useNewUrlParser: true,
-      useCreateIndex: true,
-      useUnifiedTopology: true,
-    },
+    // options: {
+    //   user: 'demo',
+    //   pass: 'demo',
+    //   authSource: 'admin',
+    //   useNewUrlParser: true,
+    //   useCreateIndex: true,
+    //   useUnifiedTopology: true,
+    // },
   };
 
   return config;