From b369399ec728a63ecf5130157c3069cb218d90d5 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 21 Mar 2025 14:50:44 +0800
Subject: [PATCH] 2025-03-21

---
 src/main/resources/mapper/project/ProjectDao.xml   |  5 +++--
 .../TechnicalSpecificationMapper.xml               | 14 ++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index d90f690e..46f60dc4 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -86,14 +86,15 @@
 <select id="searchOperatorWithSite" resultType="com.spring.modules.project.data.PlmOperatorData">
      select operator_id,operator_name from plm_operator u
     <if test="roleNo != null and roleNo != ''">
-        left join AccessRole r on u.site = r.site and u.operator_id = r.username and role_no = #{roleNo}
+        inner join AccessRole r on u.site = r.site and u.operator_id = r.username and role_no = #{roleNo}
     </if>
     <where>
          and u.site=#{site}
          <if test="operatorId != null and operatorId != ''">
                 AND u.operator_id like #{operatorId}
          </if>
-     </where>
+    </where>
+    order by operator_id desc
 </select>
 
 <select id="searchProjectTeam" resultType="PlmOperatorData">
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index a268e707..b301d63f 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -164,10 +164,16 @@
 </select>
 
 <select id="searchBMUser" resultType="PlmOperatorData">
-   select a.username operator_id,a.user_display operator_name,b.site,b.bu_no as buNo
-   from sys_user  a left join AccessBu b on a.username=b.username where b.bu_no = #{buNo} and b.site =#{site}
-
-
+    select a.username operator_id, a.user_display operator_name, b.site, b.bu_no as buNo
+    from sys_user a
+             left join AccessBu b on a.username = b.username
+             <if test="roleNo != null and roleNo != ''">
+                 inner join AccessRole r on r.username = a.username and r.role_no = #{roleNo}
+             </if>
+    where b.bu_no = #{buNo}
+      and b.site = #{site}
+
+    order by a.username desc
 </select>
 
 <select id="tsdBasicInformationSearch" resultType="PlmTechnicalSpecificationSheetData">