From 44d1be497f2d9bdcd0742247e51ebdcd68cee60e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 1 Jul 2024 23:44:59 +0800
Subject: [PATCH] =?UTF-8?q?2024.7.1=20=E4=BA=A7=E5=93=81=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/service/Impl/EamProjectServiceImpl.java    | 3 +++
 src/main/resources/mapper/pms/EamProjectMapper.xml             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
index b0d8b382..6b127c8c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@@ -125,6 +125,9 @@ public class EamProjectServiceImpl implements EamProjectService {
     @Override
     public String getTestPartNo() {
         List<String> resultList = EamProjectMapper.getTestPartNo();
+        if (resultList.isEmpty()) {
+            return "";
+        }
         return resultList.get(0);
     }
 }
diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 68b06f66..79bb32fe 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -48,12 +48,13 @@
     </delete>
     <select id="eamProjectSearch" parameterType="com.xujie.sys.modules.pms.data.EamProjectInfoData" resultType="com.xujie.sys.modules.pms.data.EamProjectInfoData">
         SELECT
-            a.site,a.bu_no,a.project_id,a.project_category,a.project_name, a.project_desc,a.status, a.project_source, a.customer_no, a.priority,a.engineer,
+            a.site,a.bu_no,d.bu_desc,a.project_id,a.project_category,a.project_name, a.project_desc,a.status, a.project_source, a.customer_no, a.priority,a.engineer,
             a.remark,a.need_date,a.c_project_region,a.project_manager,a.project_owner,a.c_project_build_date,a.c_quality_engineer1,a.c_quality_engineer2,a.c_quality_engineer3,
             a.c_manufacture_engineer,a.project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,b.test_part_no,b.part_desc,b.final_part_no,c.customer_desc
         FROM plm_project_info as a
         LEFT JOIN plm_project_part as b ON a.project_id = b.project_id and a.site = b.site
         LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and a.site = c.site
+        left join CKT_MES_II_REAL.dbo.BU as d on a.site = d.site and a.bu_no = d.bu_no
         <where>
         a.site in (select site from eam_access_site where username = #{query.userName})
         and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))