Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 跑跑跑跑数据重置es See merge request LiuChao/foton-slrs-system-rest!414
2022-03-08 16:36:54 +08:00
parent 5f055e2152 c1eeea3f1f
commit 230e035424
19 changed files with 2190 additions and 127 deletions
@@ -967,6 +967,8 @@
        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        <!-- 标准类别DIC_ID 固定ID 区分 国家地区                 -->
+        AND dicstandTextStatus.dic_id = 'JKSADFH564S'
        AND dicstandTextStatus.dic_id IS NOT NULL
        AND dicstandTextStatus.valid_flag = 0
        )