diff --git a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java index bb8f4d9..dbec45d 100644 --- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java +++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java @@ -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; diff --git a/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml b/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml index 72db96a..4a254dc 100644 --- a/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml +++ b/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml @@ -42,8 +42,8 @@ AND lpw.cust_isn LIKE CONCAT('%', #{query.custIsn}, '%') - - AND lpw.org_code LIKE CONCAT('%', #{query.orgCode}, '%') + + AND lpw.dept_id = #{query.deptId} ORDER BY lpw.update_time DESC diff --git a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java b/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java index 50dcae9..2805783 100644 --- a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java +++ b/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java @@ -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}, '%')")); } } diff --git a/ruoyi-ui/src/views/loanPricing/workflow/index.vue b/ruoyi-ui/src/views/loanPricing/workflow/index.vue index e479a8f..4b28928 100644 --- a/ruoyi-ui/src/views/loanPricing/workflow/index.vue +++ b/ruoyi-ui/src/views/loanPricing/workflow/index.vue @@ -17,12 +17,14 @@ @keyup.enter.native="handleQuery" /> - - + @@ -124,16 +126,20 @@