From 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 10:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml b/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
index 6ba8965..17fa798 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
@@ -13,9 +13,7 @@
<result column="d_basic_type" property="basicData.basicType"/>
<result column="d_basic_name" property="basicData.basicName"/>
<result column="d_basic_category" property="basicData.basicCategory"/>
- <association property="basicData" javaType="com.example.erp.entity.sd.BasicData">
- <result column="basic_name" property="basicName"/>
- </association>
+
</resultMap>
@@ -38,7 +36,7 @@
select bdp.id, bdp.basic_type, bdp.basic_name, bd.basic_name as d_basic_name
from pp.basic_data_produce bdp
left join sd.basic_data bd on bdp.basic_category = bd.id
- order by bdp.id desc
+ order by bdp.basic_type,bdp.id desc
</select>
<select id="openSelectIdMp">
--
Gitblit v1.8.0