Commit e8df5b23 by Sxy

fix: 代码格式

parent 133eb3ad
......@@ -259,32 +259,32 @@ class DeliverybillCtl extends CtlBase {
}
}
}
const position_t_info = ms.position_info;
if (position_t_info && position_t_info != 'undefined') {
if (position_t_info.phoneNumber && position_t_info.phoneNumber != 'undefined') {
position_t_info.phoneNumber = system.decryptStr(position_t_info.phoneNumber);
const positionTInfo = ms.position_info;
if (positionTInfo && positionTInfo != 'undefined') {
if (positionTInfo.phoneNumber && positionTInfo.phoneNumber != 'undefined') {
positionTInfo.phoneNumber = system.decryptStr(positionTInfo.phoneNumber);
}
if (position_t_info.IdentificationNumber && position_t_info.IdentificationNumber != 'undefined') {
position_t_info.IdentificationNumber = system.decryptStr(position_t_info.IdentificationNumber);
if (positionTInfo.IdentificationNumber && positionTInfo.IdentificationNumber != 'undefined') {
positionTInfo.IdentificationNumber = system.decryptStr(positionTInfo.IdentificationNumber);
}
if (position_t_info.positionData && position_t_info.positionData.length > 0) {
for (let i = 0; i < position_t_info.positionData.length; i++) {
if (position_t_info.positionData[i].fixedPhone && position_t_info.positionData[i].fixedPhone != 'undefined') {
position_t_info.positionData[i].fixedPhone = (
system.decryptStr(position_t_info.positionData[i].fixedPhone)
if (positionTInfo.positionData && positionTInfo.positionData.length > 0) {
for (let i = 0; i < positionTInfo.positionData.length; i++) {
if (positionTInfo.positionData[i].fixedPhone && positionTInfo.positionData[i].fixedPhone != 'undefined') {
positionTInfo.positionData[i].fixedPhone = (
system.decryptStr(positionTInfo.positionData[i].fixedPhone)
);
}
if (position_t_info.positionData[i].mobilePhone && position_t_info.positionData[i].mobilePhone != 'undefined') {
position_t_info.positionData[i].mobilePhone = (
system.decryptStr(position_t_info.positionData[i].mobilePhone)
if (positionTInfo.positionData[i].mobilePhone && positionTInfo.positionData[i].mobilePhone != 'undefined') {
positionTInfo.positionData[i].mobilePhone = (
system.decryptStr(positionTInfo.positionData[i].mobilePhone)
);
}
}
}
}
rarr.positionInfo = position_t_info;// 任职信息;公司注册和个人独资时取该值
rarr.managerInfo = position_t_info;// 经营者信息,个体工商户的经营者信息取该值
rarr.positionInfo = positionTInfo;// 任职信息;公司注册和个人独资时取该值
rarr.managerInfo = positionTInfo;// 经营者信息,个体工商户的经营者信息取该值
rarr.regInfo = ms.file_info;// 注册文件信息
rarr.expressInfo = ms.express_info;// 邮寄信息
if (rarr.expressInfo && rarr.expressInfo.addresseePhone && rarr.expressInfo.addresseePhone != 'undefined') {
......@@ -1018,7 +1018,7 @@ class DeliverybillCtl extends CtlBase {
try {
m += s2.split('.')[1].length;
} catch (e) { }
return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m);
return ((Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) / Math.pow(10, m));
}
FenToYuan(fen) {
......
......@@ -21,7 +21,15 @@ class CompanyService extends ServiceBase {
const us = await self.db.models.user.findAll({ where: { opath: opathstr }, transaction: t });
// 查询出角色
const roleids = curNodeData.roles;
const rs = await self.db.models.role.findAll({ where: { id: { [self.db.Op.in]: roleids }, app_id: p.app_id, company_id: p.company_id }, transaction: t });
const rs = await self.db.models.role.findAll({
where: {
id: {
[self.db.Op.in]: roleids,
},
app_id: p.app_id,
company_id: p.company_id,
}, transaction: t,
});
for (const u of us) {
await u.setRoles(rs, { transaction: t });
}
......
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