Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
e8df5b23
Commit
e8df5b23
authored
Nov 18, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 代码格式
parent
133eb3ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+17
-17
ic-deliver/app/base/service/impl/common/companySve.js
+9
-1
No files found.
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
e8df5b23
...
...
@@ -259,32 +259,32 @@ class DeliverybillCtl extends CtlBase {
}
}
}
const
position
_t_i
nfo
=
ms
.
position_info
;
if
(
position
_t_info
&&
position_t_i
nfo
!=
'undefined'
)
{
if
(
position
_t_info
.
phoneNumber
&&
position_t_i
nfo
.
phoneNumber
!=
'undefined'
)
{
position
_t_info
.
phoneNumber
=
system
.
decryptStr
(
position_t_i
nfo
.
phoneNumber
);
const
position
TI
nfo
=
ms
.
position_info
;
if
(
position
TInfo
&&
positionTI
nfo
!=
'undefined'
)
{
if
(
position
TInfo
.
phoneNumber
&&
positionTI
nfo
.
phoneNumber
!=
'undefined'
)
{
position
TInfo
.
phoneNumber
=
system
.
decryptStr
(
positionTI
nfo
.
phoneNumber
);
}
if
(
position
_t_info
.
IdentificationNumber
&&
position_t_i
nfo
.
IdentificationNumber
!=
'undefined'
)
{
position
_t_info
.
IdentificationNumber
=
system
.
decryptStr
(
position_t_i
nfo
.
IdentificationNumber
);
if
(
position
TInfo
.
IdentificationNumber
&&
positionTI
nfo
.
IdentificationNumber
!=
'undefined'
)
{
position
TInfo
.
IdentificationNumber
=
system
.
decryptStr
(
positionTI
nfo
.
IdentificationNumber
);
}
if
(
position
_t_info
.
positionData
&&
position_t_i
nfo
.
positionData
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
position
_t_i
nfo
.
positionData
.
length
;
i
++
)
{
if
(
position
_t_info
.
positionData
[
i
].
fixedPhone
&&
position_t_i
nfo
.
positionData
[
i
].
fixedPhone
!=
'undefined'
)
{
position
_t_i
nfo
.
positionData
[
i
].
fixedPhone
=
(
system
.
decryptStr
(
position
_t_i
nfo
.
positionData
[
i
].
fixedPhone
)
if
(
position
TInfo
.
positionData
&&
positionTI
nfo
.
positionData
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
position
TI
nfo
.
positionData
.
length
;
i
++
)
{
if
(
position
TInfo
.
positionData
[
i
].
fixedPhone
&&
positionTI
nfo
.
positionData
[
i
].
fixedPhone
!=
'undefined'
)
{
position
TI
nfo
.
positionData
[
i
].
fixedPhone
=
(
system
.
decryptStr
(
position
TI
nfo
.
positionData
[
i
].
fixedPhone
)
);
}
if
(
position
_t_info
.
positionData
[
i
].
mobilePhone
&&
position_t_i
nfo
.
positionData
[
i
].
mobilePhone
!=
'undefined'
)
{
position
_t_i
nfo
.
positionData
[
i
].
mobilePhone
=
(
system
.
decryptStr
(
position
_t_i
nfo
.
positionData
[
i
].
mobilePhone
)
if
(
position
TInfo
.
positionData
[
i
].
mobilePhone
&&
positionTI
nfo
.
positionData
[
i
].
mobilePhone
!=
'undefined'
)
{
position
TI
nfo
.
positionData
[
i
].
mobilePhone
=
(
system
.
decryptStr
(
position
TI
nfo
.
positionData
[
i
].
mobilePhone
)
);
}
}
}
}
rarr
.
positionInfo
=
position
_t_i
nfo
;
// 任职信息;公司注册和个人独资时取该值
rarr
.
managerInfo
=
position
_t_i
nfo
;
// 经营者信息,个体工商户的经营者信息取该值
rarr
.
positionInfo
=
position
TI
nfo
;
// 任职信息;公司注册和个人独资时取该值
rarr
.
managerInfo
=
position
TI
nfo
;
// 经营者信息,个体工商户的经营者信息取该值
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
)
{
...
...
ic-deliver/app/base/service/impl/common/companySve.js
View file @
e8df5b23
...
...
@@ -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
});
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment