From b4f2504f03c12f135e533485b2ac56dd4be46285 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 23 Jun 2025 14:02:40 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-23=20=E6=8A=80=E6=9C=AF=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8D=A1=20=E6=8E=A7=E5=88=B6=E5=8F=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/request/RequestManageMapper.xml    | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index 0cad44ee..633f9dd9 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -275,16 +275,13 @@
         CONVERT(varchar(50), comm.value)  AS fieldName
         FROM
         sys.columns AS col
-        INNER JOIN
-        sys.tables AS tbl ON col.object_id = tbl.object_id
-        INNER JOIN
-        sys.types AS typ ON col.user_type_id = typ.user_type_id
-        LEFT JOIN
-        sys.extended_properties AS comm ON col.object_id = comm.major_id AND col.column_id = comm.minor_id
+        INNER JOIN sys.tables AS tbl ON col.object_id = tbl.object_id
+        INNER JOIN sys.schemas AS scm ON tbl.schema_id = scm.schema_id
+        INNER JOIN sys.types AS typ ON col.user_type_id = typ.user_type_id
+        LEFT JOIN sys.extended_properties AS comm ON comm.major_id = col.object_id AND comm.minor_id = col.column_id AND comm.name = N'MS_Description'
         WHERE
         tbl.name = #{tableId} and CONVERT(varchar(50), comm.value) is not null and CONVERT(varchar(50), comm.value) <![CDATA[<>]]> ''
-        ORDER BY
-        col.column_id
+        ORDER BY col.column_id
     </select>
 
     <select id="getAuthorityFieldList" parameterType="TableData" resultType="PlmFieldData">
@@ -298,13 +295,11 @@
                   col.name AS fieldId,
                   CONVERT(varchar(50), comm.value)  AS fieldName
               FROM
-                  sys.columns AS col
-                      INNER JOIN
-                  sys.tables AS tbl ON col.object_id = tbl.object_id
-                      INNER JOIN
-                  sys.types AS typ ON col.user_type_id = typ.user_type_id
-                      LEFT JOIN
-                  sys.extended_properties AS comm ON col.object_id = comm.major_id AND col.column_id = comm.minor_id
+                sys.columns AS col
+                INNER JOIN sys.tables AS tbl ON col.object_id = tbl.object_id
+                INNER JOIN sys.schemas AS scm ON tbl.schema_id = scm.schema_id
+                INNER JOIN sys.types AS typ ON col.user_type_id = typ.user_type_id
+                LEFT JOIN sys.extended_properties AS comm ON comm.major_id = col.object_id AND comm.minor_id = col.column_id AND comm.name = N'MS_Description'
               WHERE
                   tbl.name = #{tableId}) as a
         left join plm_request_node_authority as b on a.fieldId = b.field_id and b.site = #{site} and b.classification_no = #{classificationNo} and b.node_id = #{nodeId} and b.table_id = #{tableId}