Commit 8fe92c08 by huluobin

# 更新

parent 7f0ae6ae
...@@ -283,11 +283,11 @@ ...@@ -283,11 +283,11 @@
from cost t1 from cost t1
left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
<if test=" req.currentUserId!=null "> <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 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 role_cost_company_binding rccb on urb.role_id = rccb.role_id
left join cost_company cc on rccb.cost_company_id = cc.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> </if>
where where
true true
......
...@@ -39,7 +39,7 @@ import java.util.List; ...@@ -39,7 +39,7 @@ import java.util.List;
@Slf4j @Slf4j
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest @SpringBootTest
@ActiveProfiles("test") @ActiveProfiles("prod")
class AbstractCostServiceTest { class AbstractCostServiceTest {
@Resource @Resource
CostCompanyDao costCompanyDao; CostCompanyDao costCompanyDao;
...@@ -169,7 +169,7 @@ class AbstractCostServiceTest { ...@@ -169,7 +169,7 @@ class AbstractCostServiceTest {
@Test @Test
void queryPage(){ void queryPage(){
CostQueryPageReq req = new CostQueryPageReq(); CostQueryPageReq req = new CostQueryPageReq();
req.setCurrentUserId(3108); req.setCurrentUserId(4173);
costService.queryPage(req); costService.queryPage(req);
} }
......
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