复用机构树按部门查询流程列表
This commit is contained in:
@@ -381,10 +381,10 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
|
||||
wrapper.like(LoanPricingWorkflow::getCustIsn, loanPricingWorkflow.getCustIsn());
|
||||
}
|
||||
|
||||
// 按机构号筛选
|
||||
if (StringUtils.hasText(loanPricingWorkflow.getOrgCode()))
|
||||
// 按创建人部门筛选
|
||||
if (loanPricingWorkflow.getDeptId() != null)
|
||||
{
|
||||
wrapper.like(LoanPricingWorkflow::getOrgCode, loanPricingWorkflow.getOrgCode());
|
||||
wrapper.eq(LoanPricingWorkflow::getDeptId, loanPricingWorkflow.getDeptId());
|
||||
}
|
||||
|
||||
return wrapper;
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
<if test="query != null and query.custIsn != null and query.custIsn != ''">
|
||||
AND lpw.cust_isn LIKE CONCAT('%', #{query.custIsn}, '%')
|
||||
</if>
|
||||
<if test="query != null and query.orgCode != null and query.orgCode != ''">
|
||||
AND lpw.org_code LIKE CONCAT('%', #{query.orgCode}, '%')
|
||||
<if test="query != null and query.deptId != null">
|
||||
AND lpw.dept_id = #{query.deptId}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY lpw.update_time DESC
|
||||
|
||||
@@ -21,6 +21,7 @@ class LoanPricingWorkflowMapperXmlTest
|
||||
assertTrue(xml.contains("lpw.create_by = #{query.dataScopeCreateBy}"));
|
||||
assertTrue(xml.contains("lpw.dept_id IN"));
|
||||
assertTrue(xml.contains("find_in_set(#{query.dataScopeDeptId}, ancestors)"));
|
||||
assertTrue(xml.contains("lpw.dept_id = #{query.deptId}"));
|
||||
assertTrue(xml.contains("SUBSTRING_INDEX(lpw.create_by, '-', -1) LIKE CONCAT('%', #{query.createBy}, '%')"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user