diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java index 4c397f2ed..ab7e0c8da 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java @@ -6,11 +6,9 @@ import com.accompany.admin.vo.BillRecordVo; import com.accompany.business.model.Gift; import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.record.BillRecordService; -import com.accompany.common.constant.Constant; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.enumeration.CurrencyEnum; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; @@ -58,15 +56,7 @@ public class BillRecordAdminService extends BaseService { if(billType != null){ - List bList = new ArrayList<>(); - if(billType.equals(Constant.BillType.openNoble)){ - bList = Arrays.asList(Constant.BillType.openNoble, Constant.BillType.renewNoble); - }else if(billType.equals(Constant.BillType.purchaseCarGoods)){ - bList = Arrays.asList(Constant.BillType.purchaseCarGoods, Constant.BillType.renewCarGoods); - }else { - bList.add(billType); - } - wrapper.lambda().in(BillRecord::getObjType, bList) + wrapper.lambda().eq(BillRecord::getObjType, billType) .in(BillRecord::getPartitionId, Arrays.stream(PartitionEnum.values()).map(PartitionEnum::getId).sorted().toList()); }