From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..dea34f2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
@@ -13,19 +13,16 @@
<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>
<select id="SelectWorkBasicTeams" resultMap="selectBasicDataProduce">
- select 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
- where bd.basic_name = #{process}
- and bdp.basic_type = "teamsgroups"
+ SELECT user_name as basic_name,address as d_basic_name from erp_user_info.user
+ where address IS NOT NULL and address= #{process}
+
</select>
<!-- 鏌ヨ宸ュ簭-->
@@ -38,7 +35,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