From d2487891866a2aa42c7cb3ff9a8e7e869877d782 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 13:49:20 +0800
Subject: [PATCH] 替换流程完成后增加了审批记录,可导出;程序版本号+1;增加批量审核接口

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml |   10 +++++-----
 1 files changed, 5 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 6bc337c..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,11 @@
         <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_division 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

--
Gitblit v1.9.3