Commit 7124ef60 authored by 施翔轲's avatar 施翔轲

直接费fix bug

parent 5061d5df
...@@ -244,7 +244,8 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe ...@@ -244,7 +244,8 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
//查询该菜单下的清 //查询该菜单下的清
List<CbDirectExpenseDataDetailVo> qingList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>() List<CbDirectExpenseDataDetailVo> qingList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
.eq(CbDirectExpense::getParentId, menuId) .eq(CbDirectExpense::getParentId, menuId)
.eq(CbDirectExpense::getExpenseCategoryTag, CbProjectConstants.DIRECT_EXPENSE_CATEGORY_TAG_QING)), CbDirectExpenseDataDetailVo.class); //.eq(CbDirectExpense::getExpenseCategoryTag, CbProjectConstants.DIRECT_EXPENSE_CATEGORY_TAG_QING)
), CbDirectExpenseDataDetailVo.class);
Assert.isFalse(qingList.isEmpty(), "该菜单下无数据"); Assert.isFalse(qingList.isEmpty(), "该菜单下无数据");
//生成数据树形 //生成数据树形
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
select cde.id menuId, cde.parent_id, cde.expense_name menuName, cde.level menuLevel select cde.id menuId, cde.parent_id, cde.expense_name menuName, cde.level menuLevel
from cb_direct_expense cde from cb_direct_expense cde
where cde.project_id = #{projectId} where cde.project_id = #{projectId}
and cde.expense_category_tag regexp #{regx} <!-- and cde.expense_category_tag regexp #{regx}-->
and cde.expense_category_tag in ('1','2','3')
and cde.del_flag = #{deleteFlagExist} and cde.del_flag = #{deleteFlagExist}
order by cde.sort order by cde.sort
</select> </select>
......
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