Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-cost
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
bailuntec-cost
Commits
8fe92c08
Commit
8fe92c08
authored
Mar 10, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 更新
parent
7f0ae6ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Cost.xml
cost-service/src/main/resources/mapper/Cost.xml
+2
-2
AbstractCostServiceTest.java
...odule/cost/service/impl/cost/AbstractCostServiceTest.java
+2
-2
No files found.
cost-service/src/main/resources/mapper/Cost.xml
View file @
8fe92c08
...
...
@@ -283,11 +283,11 @@
from cost t1
left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
<if
test=
" req.currentUserId!=null "
>
left join (select t3.oa_user_id, cc.company_no from bailun_other.oa_user t3
left join (select
* from (select
t3.oa_user_id, cc.company_no from bailun_other.oa_user t3
left join user_role_binding urb on t3.oa_user_id = urb.oa_user_id
left join role_cost_company_binding rccb on urb.role_id = rccb.role_id
left join cost_company cc on rccb.cost_company_id = cc.id
group t3.oa_user_id,t3.company_id
) t on t1.create_userid = t.oa_user_id and t1.company_no = t.company_no
where t3.oa_user_id = #{req.currentUserId}) tt GROUP BY company_no
) t on t1.create_userid = t.oa_user_id and t1.company_no = t.company_no
</if>
where
true
...
...
cost-service/src/test/java/com/blt/other/module/cost/service/impl/cost/AbstractCostServiceTest.java
View file @
8fe92c08
...
...
@@ -39,7 +39,7 @@ import java.util.List;
@Slf4j
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
@ActiveProfiles
(
"
test
"
)
@ActiveProfiles
(
"
prod
"
)
class
AbstractCostServiceTest
{
@Resource
CostCompanyDao
costCompanyDao
;
...
...
@@ -169,7 +169,7 @@ class AbstractCostServiceTest {
@Test
void
queryPage
(){
CostQueryPageReq
req
=
new
CostQueryPageReq
();
req
.
setCurrentUserId
(
3108
);
req
.
setCurrentUserId
(
4173
);
costService
.
queryPage
(
req
);
}
...
...
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