From 6e518845c473e9f082d8c0574b6a85ab9902bbed Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 17 Jun 2023 14:55:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8E=A8=E9=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/oldproject/entity/WarehouseEntity.java | 14 ++++++++++---- .../oldproject/mapper/AdvanceDetailMapper.xml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WarehouseEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WarehouseEntity.java index d2d007540..ad3f5bc24 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WarehouseEntity.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WarehouseEntity.java @@ -16,12 +16,12 @@ */ package com.logpm.oldproject.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; /** * 仓库 实体类 @@ -32,8 +32,14 @@ import org.springblade.core.tenant.mp.TenantEntity; @Data @TableName("ht_warehouse") @ApiModel(value = "Warehouse对象", description = "仓库") -@EqualsAndHashCode(callSuper = true) -public class WarehouseEntity extends TenantEntity { +public class WarehouseEntity { + + + @TableId( + value = "id", + type = IdType.AUTO + ) + private Integer id ; /** * 代码 diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 5f3f110ae..72107c5f2 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -82,7 +82,7 @@ FROM ht_advance_detail d left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0 left join ht_way_bill wb on wb.id = wo.way_bill_id and wb.delete_time = 0 - where d.unitNo = ${unitNo} + where d.unitNo = #{unitNo}