Commit af931144 by Sxy

fix: 分配时填写昵称

parent 8d210b2f
...@@ -435,7 +435,13 @@ class UserService extends ServiceBase { ...@@ -435,7 +435,13 @@ class UserService extends ServiceBase {
const companyFind = await self.companyDao.model.findOne({ const companyFind = await self.companyDao.model.findOne({
where: { name: spName }, include: [ where: { name: spName }, include: [
{ {
model: self.db.models.user, as: 'us', attributes: ['id', 'userName', 'mobile', 'isAllocated', 'opath', 'skilltags', 'regiontags', 'isAllArea', 'isSalesman', 'isDelivery', 'tx_uin'], raw: true, model: self.db.models.user,
as: 'us',
attributes: ['id', 'userName', 'nickName',
'mobile', 'isAllocated', 'opath', 'skilltags',
'regiontags', 'isAllArea', 'isSalesman',
'isDelivery', 'tx_uin'],
raw: true,
}, },
], excludes: ['orgJson'], transaction: t, ], excludes: ['orgJson'], transaction: t,
}); });
...@@ -467,6 +473,7 @@ class UserService extends ServiceBase { ...@@ -467,6 +473,7 @@ class UserService extends ServiceBase {
const tmp = { const tmp = {
userId: selresult.id, userId: selresult.id,
userName: selresult.userName, userName: selresult.userName,
nickName: selresult.nickName,
mobile: selresult.mobile, mobile: selresult.mobile,
opath: selresult.opath, opath: selresult.opath,
compId: companyFind.id, compId: companyFind.id,
...@@ -546,7 +553,14 @@ class UserService extends ServiceBase { ...@@ -546,7 +553,14 @@ class UserService extends ServiceBase {
const companyFind = await self.companyDao.model.findOne({ const companyFind = await self.companyDao.model.findOne({
where: { name: spName }, include: [ where: { name: spName }, include: [
{ {
model: self.db.models.user, as: 'us', attributes: ['id', 'userName', 'mobile', 'isAllocated', 'opath', 'skilltags', 'regiontags', 'isAllArea', 'isSalesman', 'isDelivery', 'tx_uin'], raw: true, model: self.db.models.user,
as: 'us',
attributes: [
'id', 'userName', 'nickName',
'mobile', 'isAllocated', 'opath', 'skilltags',
'regiontags', 'isAllArea', 'isSalesman',
'isDelivery', 'tx_uin'],
raw: true,
}, },
], excludes: ['orgJson'], transaction: t, ], excludes: ['orgJson'], transaction: t,
}); });
...@@ -578,6 +592,7 @@ class UserService extends ServiceBase { ...@@ -578,6 +592,7 @@ class UserService extends ServiceBase {
const tmp = { const tmp = {
userId: selresult.id, userId: selresult.id,
userName: selresult.userName, userName: selresult.userName,
nickName: selresult.nickName,
mobile: selresult.mobile, mobile: selresult.mobile,
opath: selresult.opath, opath: selresult.opath,
cost: costAmount, cost: costAmount,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment