用户增加pid与机构名称

app/controller/.user.js

@@ -9,6 +9,8 @@ module.exports = {
       'menus',
       'uid',
       'deptid',
+      'deptname',
+      'pid',
       'remark'
     ]
   },
@@ -27,6 +29,8 @@ module.exports = {
       'role',
       'menus',
       'deptid',
+      'deptname',
+      'pid',
       'remark'
     ]
   },
@@ -43,6 +47,8 @@ module.exports = {
         uid: 'uid',
         phone:'phone',
         deptid:'deptid',
+        deptname:'deptname',
+        pid:'pid',
         role: 'role'
       }
     },

app/model/user.js

@@ -12,7 +12,8 @@ const UserSchema = {
   uid: { type: String, required: false }, // 用户信息id
   role: { type: String, required: false }, // 1-管理员,2-个人,3-企业管理员,4-子管理员,6、专家 7、临时用户
   menus: { type: [ String ], required: false }, // 菜单权限
-  deptid: { type: String, required: false }, // 机构id
+  pid: { type: String, required: false }, // 父id
+  deptname: { type: String, required: false }, // 机构名称
   remark: { type: String, required: false }, // 备注
 };
 

app/service/login.js

@@ -80,10 +80,10 @@ class LoginService extends CrudService {
   }
 
   // 创建登录Token
-  async createJwt({ id, name, uid, phone, role, menus, remark, openid, deptid }) {
+  async createJwt({ id, name, uid, phone, role, menus, remark, openid, deptid, deptname, pid }) {
     const { secret, expiresIn = '1d', issuer = role } = this.config.jwt;
     const subject = phone;
-    const res = { uid: id, userid: uid, name, phone, role, menus, openid, remark, deptid };
+    const res = { uid: id, userid: uid, name, phone, role, menus, openid, remark, deptid, deptname, pid };
     const token = await jwt.sign(res, secret, { expiresIn, issuer, subject });
     return token;
   }

app/service/user.js

@@ -40,7 +40,7 @@ class UserService extends CrudService {
 
   // 重写修改方法
   async update({ id }, data) {
-    const { name, phone, passwd, openid, role, menus, remark, uid, deptid } = data;
+    const { name, phone, passwd, openid, role, menus, remark, uid, deptid, deptname, pid } = data;
     const user = await this.model.findById(id, '+passwd');
     if (name) {
       user.name = name;
@@ -67,6 +67,12 @@ class UserService extends CrudService {
     if (deptid) {
       user.deptid = deptid;
     }
+    if (deptname) {
+      user.deptname = deptname;
+    }
+    if (pid) {
+      user.pid = pid;
+    }
     if (remark) {
       user.remark = remark;
     }