diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 91dfa614..01d9e28d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -373,9 +373,9 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getAttrMap = row.getAttrInfoMap(); Map getNewMap = new LinkedHashMap<>(); if (getAttrMap != null && getAttrMap.size() > 0) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index 9ebd7e9a..84cce101 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -282,7 +282,7 @@ DISTINCT SAR_LAWS_STAND_INFO.ID, - laws_type_show.DIC_TYPE_NAME as LAWS_TYPE, + SAR_LAWS_STAND_INFO.LAWS_TYPE, SAR_LAWS_STAND_INFO.LAWS_NUMBER, SAR_LAWS_STAND_INFO.LAWS_NAME, SAR_LAWS_STAND_INFO.LAWS_EN_NAME, @@ -292,13 +292,13 @@ SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START, SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END, SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE, - laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX, - laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY, + SAR_LAWS_STAND_INFO.LAWS_SYCX, + SAR_LAWS_STAND_INFO.LAWS_SYQY, SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS, - laws_year_show.DIC_TYPE_NAME as LAWS_YEAR, + SAR_LAWS_STAND_INFO.LAWS_YEAR, SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM, SAR_LAWS_STAND_INFO.LAWS_BULLETIN, - laws_label_show.DIC_TYPE_NAME as LAWS_LABEL, + SAR_LAWS_STAND_INFO.LAWS_LABEL, SAR_LAWS_STAND_INFO.LAWS_REMARK, SAR_LAWS_STAND_INFO.COUNTRY, SAR_LAWS_STAND_INFO.MODIFY_TIME, @@ -384,24 +384,6 @@ AND dicstandTextStatus.dic_id IS NOT NULL AND dicstandTextStatus.valid_flag = 0 ) - - LEFT JOIN TS_DICTYPE laws_label_show ON ( - laws_label_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_LABEL - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) - - LEFT JOIN TS_DICTYPE laws_sycx_show ON ( - laws_sycx_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) - - LEFT JOIN TS_DICTYPE laws_syqy_show ON ( - laws_syqy_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY - AND dicstandTextStatus.dic_id IS NOT NULL - AND dicstandTextStatus.valid_flag = 0 - ) LEFT JOIN TS_DICTYPE laws_type_show ON ( laws_type_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE