From 470e647b6920774e4a297c46b7b7300bd22037b7 Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期四, 06 六月 2024 14:57:31 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java index 54b6899..9b6ecad 100644 --- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java +++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java @@ -1,7 +1,9 @@ package com.example.erp.service.sd; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.example.erp.entity.sd.BasicData; +import com.example.erp.entity.sd.BasicOtherMoney; import com.example.erp.entity.sd.Customer; import com.example.erp.mapper.sd.BasicDateMapper; import com.example.erp.mapper.sd.BasicOtherMoneyMapper; @@ -42,7 +44,10 @@ orderBasicDataMap.get("customer").add(customer); } - orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null))); + orderBasicDataMap.put("orderOtherMoney", + Collections.singletonList( + basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1)) + )); //杩斿洖Map瀵硅薄 -- Gitblit v1.8.0