From cef990730c07e7fcdbe015bdfb0f0e27f7e06e27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 01 八月 2025 16:52:56 +0800
Subject: [PATCH] 机床管理bug修复；勤哲对接完善
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
index c3ef778..e77bbd9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
@@ -14,11 +14,12 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>-->
<select id="pageQuery" resultType="org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO">
- select p.id,p.team_leader_id,p.programmer_id,p.checker_id,p.senior_id,l.name team_leader_name,pro.name programmer_name,c.name checker_name,s.name seniorName
- from mdm_produce_plan p join blade_user l on p.team_leader_id=l.id and l.is_deleted=0
- join blade_user pro on p.programmer_id=pro.id and pro.is_deleted=0
- join blade_user c on p.checker_id=c.id and c.is_deleted=0
- join blade_user s on p.senior_id=s.id and c.is_deleted=0
+ select p.id,p.drawing_no,p.team_leader_id,p.programmer_id,p.checker_id,p.senior_id,l.name team_leader_name,pro.name programmer_name,c.name checker_name,s.name seniorName
+ from mdm_produce_division p left join blade_user l on p.team_leader_id=l.id and l.is_deleted=0
+ left join blade_user pro on p.programmer_id=pro.id and pro.is_deleted=0
+ left join blade_user c on p.checker_id=c.id and c.is_deleted=0
+ left join blade_user s on p.senior_id=s.id and c.is_deleted=0
+ where p.is_deleted=0
<if test="name != null and name != ''">
AND (l.account like concat('%',#{name,jdbcType=VARCHAR},'%') or l.name like
concat('%',#{name,jdbcType=VARCHAR},'%')
--
Gitblit v1.9.3