Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
43a230e1
Commit
43a230e1
authored
Apr 25, 2019
by
zhkwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务数据抽取和数据导入记录除了admin只能看到自己的操作记录
parent
70476bbe
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
DataImportService.java
...java/pwc/taxtech/atms/service/impl/DataImportService.java
+9
-0
No files found.
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @
43a230e1
...
@@ -2155,6 +2155,10 @@ public class DataImportService extends BaseService {
...
@@ -2155,6 +2155,10 @@ public class DataImportService extends BaseService {
criteria
.
andTypeEqualTo
(
param
.
getType
()).
andDisplayEqualTo
(
true
);
criteria
.
andTypeEqualTo
(
param
.
getType
()).
andDisplayEqualTo
(
true
);
criteria
.
andOrganizationIdIn
(
orgIds
);
criteria
.
andOrganizationIdIn
(
orgIds
);
}
}
//财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作,其余人员只能看到本身的
if
(!
"admin"
.
equals
(
authUserHelper
.
getCurrentAuditor
().
get
()))
{
criteria
.
andOperatorEqualTo
(
authUserHelper
.
getCurrentAuditor
().
get
());
}
example
.
setOrderByClause
(
"update_time desc"
);
example
.
setOrderByClause
(
"update_time desc"
);
Page
page
=
PageHelper
.
startPage
(
param
.
getPageInfo
().
getPageIndex
(),
param
.
getPageInfo
().
getPageSize
());
Page
page
=
PageHelper
.
startPage
(
param
.
getPageInfo
().
getPageIndex
(),
param
.
getPageInfo
().
getPageSize
());
PageInfo
<
DataImportLogDto
>
pageInfo
=
new
PageInfo
<>(
dataImportLogMapper
.
selectByExample
(
example
).
stream
()
PageInfo
<
DataImportLogDto
>
pageInfo
=
new
PageInfo
<>(
dataImportLogMapper
.
selectByExample
(
example
).
stream
()
...
@@ -2193,7 +2197,12 @@ public class DataImportService extends BaseService {
...
@@ -2193,7 +2197,12 @@ public class DataImportService extends BaseService {
DataImportLogExample
.
Criteria
criteria
=
example
.
createCriteria
();
DataImportLogExample
.
Criteria
criteria
=
example
.
createCriteria
();
Page
page
=
PageHelper
.
startPage
(
param
.
getPageInfo
().
getPageIndex
(),
param
.
getPageInfo
().
getPageSize
());
Page
page
=
PageHelper
.
startPage
(
param
.
getPageInfo
().
getPageIndex
(),
param
.
getPageInfo
().
getPageSize
());
List
<
String
>
orgIds
=
organizationService
.
getMyOrgList
().
stream
().
map
(
OrgSelectDto:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
String
>
orgIds
=
organizationService
.
getMyOrgList
().
stream
().
map
(
OrgSelectDto:
:
getId
).
collect
(
Collectors
.
toList
());
//财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作,其余人员只能看到本身的
if
(
"admin"
.
equals
(
authUserHelper
.
getCurrentAuditor
().
get
()))
{
criteria
.
andOrganizationIdIn
(
orgIds
).
andCreateTimeBetween
(
strDate
,
endDate
);
criteria
.
andOrganizationIdIn
(
orgIds
).
andCreateTimeBetween
(
strDate
,
endDate
);
}
else
{
criteria
.
andOrganizationIdIn
(
orgIds
).
andCreateTimeBetween
(
strDate
,
endDate
).
andOperatorEqualTo
(
authUserHelper
.
getCurrentAuditor
().
get
());
}
example
.
setOrderByClause
(
"update_time desc"
);
example
.
setOrderByClause
(
"update_time desc"
);
PageInfo
<
DataImportLogDto
>
pageInfo
=
new
PageInfo
<>(
dataImportLogMapper
.
selectByExample
(
example
).
stream
()
PageInfo
<
DataImportLogDto
>
pageInfo
=
new
PageInfo
<>(
dataImportLogMapper
.
selectByExample
(
example
).
stream
()
.
map
(
o
->
beanUtil
.
copyProperties
(
o
,
new
DataImportLogDto
())).
collect
(
Collectors
.
toList
()));
.
map
(
o
->
beanUtil
.
copyProperties
(
o
,
new
DataImportLogDto
())).
collect
(
Collectors
.
toList
()));
...
...
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