From f38b96fc92db83bdedef08ba868d49f59ff0bad7 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 5 May 2022 13:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=20sort=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardsInfoMapper.xml                | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 3c390666..c57b8f47 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -635,7 +635,7 @@
     <sql id="SarStandardsInfo_Where_Export_Clause">
 
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
 
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
@@ -964,7 +964,7 @@
     <sql id="SarStandardsInfo_in_left_2">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
         <!-- 标准类别DIC_ID 固定ID 区分 国家地区                 -->
@@ -1130,7 +1130,7 @@
     <sql id="SarStandardsInfo_in_left_3">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
         <!-- 标准类别DIC_ID 固定ID 区分 国家地区                 -->
@@ -1160,7 +1160,7 @@
     <sql id="SarStandardsInfo_in_left">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
         AND dicstandTextStatus.dic_id IS NOT NULL
@@ -1531,7 +1531,7 @@
         from
         SAR_STANDARDS_INFO
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
         where SAR_STANDARDS_INFO.valid_flag = 0
         <!-- 标准类型 -->
         <if test="standType != null">
@@ -1668,7 +1668,7 @@
         from SAR_STANDARDS_INFO
 
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
 
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
@@ -1725,7 +1725,7 @@
         SAR_STAND_ATTR_INFO.XCXSSRQ as allPutTime
         from SAR_STANDARDS_INFO
         left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
-        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0  and dicstandSort.dic_id='JKSADFH564S')
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME!=#{stateName}
         and SAR_STAND_ATTR_INFO.XCXSSRQ != ''
@@ -1736,7 +1736,7 @@
         <include refid="Base_Column_List"/>,dicstandState.DIC_TYPE_NAME as standStateShow,SAR_STAND_ATTR_INFO.DTBJH as replace_stand_num
         from SAR_STANDARDS_INFO
         left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
-        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S')
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME != ''
         and SAR_STAND_ATTR_INFO.DTBJH != ''
@@ -1749,7 +1749,7 @@
         concat(SAR_STAND_ATTR_INFO.XCXSSRQ,',',SAR_STAND_ATTR_INFO.ZCCSSRQ) as allPutTime
         from SAR_STANDARDS_INFO
         left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
-        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S')
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where SAR_STANDARDS_INFO.valid_flag=0
         and SAR_STAND_ATTR_INFO.DTBJH != ''
@@ -1794,7 +1794,7 @@
         from SAR_STANDARDS_INFO
 
         left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
 
 
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id