Merge branch 'master' of http://git.cc-lotus.info/service-platform/service-auth

app/service/user.js

@@ -141,7 +141,7 @@ class UserService extends CrudService {
   }
 
   async finduserlist({ skip, limit, ...info }) {
-    const query = { ...info, $or: [{ role: '2' }, { role: '3' }, { role: '6' }] };
+    const query = { ...info, $or: [{ role: '4' }, { role: '5' }, { role: '6' }] };
     const total = await this.model.count(query);
     const data = await this.model.find(query).skip(Number(skip)).limit(Number(limit));
     return { data, total };